1 --- cyrus-imapd-2.2.6/lib/Makefile.in.orig 2004-05-28 20:03:04.000000000 +0200
2 +++ cyrus-imapd-2.2.6/lib/Makefile.in 2004-07-25 19:57:23.404312296 +0200
6 # Authorization namespace.
7 -AUTH=auth_@WITH_AUTH@.o
8 +AUTH=auth_@WITH_AUTH@.lo
10 # ACL interpretation. Only one choice for now:
15 top_srcdir = @top_srcdir@
21 +top_builddir = @top_builddir@
23 DEFS = @DEFS@ @LOCALDEFS@
24 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
27 exec_prefix = @exec_prefix@
28 cyrus_prefix = @cyrus_prefix@
34 $(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
35 $(srcdir)/libcyr_cfg.h
37 -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
38 - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
39 - lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
40 - chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
41 - gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
42 - @LIBOBJS@ @CYRUSDB_OBJS@ \
43 - iptostring.o xmalloc.o wildmat.o
44 +LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
45 + libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
46 + lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
47 + chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
48 + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
49 + @LTLIBOBJS@ @CYRUSDB_OBJS@ \
50 + iptostring.lo xmalloc.lo wildmat.lo
52 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
53 $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
55 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
56 - assert.o @IPV6_OBJS@
57 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
58 + assert.lo @IPV6_OBJS@
60 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
61 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
64 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
65 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
66 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
67 + $(LIBTOOL) --mode=install $(INSTALL) libcyrus.la $(DESTDIR)$(libdir)
68 + $(LIBTOOL) --mode=install $(INSTALL) libcyrus_min.la $(DESTDIR)$(libdir)
69 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
70 for file in $(LIBCYR_HDRS); \
73 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
77 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
79 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
82 -libcyrus.a: $(LIBCYR_OBJS)
84 - ar cr libcyrus.a $(LIBCYR_OBJS)
85 - $(RANLIB) libcyrus.a
87 -libcyrus_min.a: $(LIBCYRM_OBJS)
88 - rm -f libcyrus_min.a
89 - ar cr libcyrus_min.a $(LIBCYRM_OBJS)
90 - $(RANLIB) libcyrus_min.a
91 +libcyrus.la: $(LIBCYR_OBJS)
92 + $(LIBTOOL) --mode=link $(CC) -o libcyrus.la $(LIBCYR_OBJS) @LIBS@ @LIB_SASL@ -rpath $(libdir)
94 +libcyrus_min.la: $(LIBCYRM_OBJS)
95 + $(LIBTOOL) --mode=link $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
97 imapopts.c: imapoptions $(srcdir)/../tools/config2header
98 $(srcdir)/../tools/config2header CC=$(CC) $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
99 --- cyrus-imapd-2.2.6/imap/Makefile.in.orig 2004-05-28 20:03:02.000000000 +0200
100 +++ cyrus-imapd-2.2.6/imap/Makefile.in 2004-07-25 20:07:43.948975168 +0200
106 +top_builddir = @top_builddir@
109 CYRUS_USER=@cyrus_user@
111 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
112 LIB_WRAP = @LIB_WRAP@
113 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
114 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
115 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
118 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
120 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
121 for file in $(PROGS); \
123 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
124 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
126 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
128 @@ -187,156 +189,156 @@
131 idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
132 - $(CC) $(LDFLAGS) -o idled \
133 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o idled \
134 idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
136 lmtpd: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) \
137 $(DEPLIBS) $(SERVICE)
138 - $(CC) $(LDFLAGS) -o lmtpd \
139 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd \
140 $(SERVICE) lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
141 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
143 lmtpd.pure: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
144 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
145 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
146 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd.pure \
147 $(SERVICE) lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
148 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
150 lmtpproxyd: lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
151 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
152 - $(CC) $(LDFLAGS) -o lmtpproxyd \
153 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpproxyd \
154 $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
155 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
157 lmtpproxyd.pure: lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
158 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
159 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpproxyd.pure \
160 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpproxyd.pure \
161 $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
162 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
164 imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
165 - $(CC) $(LDFLAGS) -o imapd \
166 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd \
167 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
168 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
170 imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
171 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
172 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd.pure \
173 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
174 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
176 imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
177 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
178 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd.quant \
179 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
180 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
182 proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
183 - $(CC) $(LDFLAGS) -o proxyd \
184 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o proxyd \
185 $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
186 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
188 proxyd.pure: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
189 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o proxyd.pure \
190 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o proxyd.pure \
191 $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
192 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
194 mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
196 - $(CC) $(LDFLAGS) -o mupdate \
197 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mupdate \
198 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
199 mutex_pthread.o tls.o libimap.a \
200 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
202 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
204 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
205 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mupdate.pure \
206 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
207 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
209 pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
210 - $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
211 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
212 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
214 nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
215 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
216 - $(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \
217 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \
218 smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
219 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
221 fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
222 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
223 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
224 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
226 smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
227 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
228 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
229 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
231 ### Command Line Utilities
232 arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
233 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
234 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
235 libimap.a $(DEPLIBS) $(LIBS)
237 cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
238 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
239 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
240 libimap.a $(DEPLIBS) $(LIBS)
242 chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
243 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
244 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
245 libimap.a $(DEPLIBS) $(LIBS)
247 deliver: deliver.o backend.o $(LMTPOBJS) mutex_fake.o libimap.a $(DEPLIBS)
248 - $(CC) $(LDFLAGS) -o deliver deliver.o backend.o $(LMTPOBJS) \
249 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o deliver deliver.o backend.o $(LMTPOBJS) \
250 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
252 ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
253 - $(CC) $(LDFLAGS) -o \
254 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
255 $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
257 ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
258 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
259 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
260 libimap.a $(DEPLIBS) $(LIBS)
262 ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
263 - $(CC) $(LDFLAGS) -o \
264 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
265 $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
267 cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
268 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
269 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
270 libimap.a $(DEPLIBS) $(LIBS)
272 fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
273 - $(CC) $(LDFLAGS) -o \
274 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
275 $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
277 squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
278 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
279 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
280 $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
282 mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
283 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
284 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
287 ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
288 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
289 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
290 libimap.a $(DEPLIBS) $(LIBS)
292 cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
293 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
294 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
295 libimap.a $(DEPLIBS) $(LIBS)
297 mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
298 - $(CC) $(LDFLAGS) -o \
299 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
300 mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
302 reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
303 - $(CC) $(LDFLAGS) -o \
304 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
305 reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
307 quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
308 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
309 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
310 libimap.a $(DEPLIBS) $(LIBS)
312 tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
313 - $(CC) $(LDFLAGS) -o \
314 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
315 $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
317 ### Other Misc Targets
318 --- cyrus-imapd-2.2.3/perl/imap/Makefile.PL.orig 2003-10-22 18:50:18.000000000 +0000
319 +++ cyrus-imapd-2.2.3/perl/imap/Makefile.PL 2004-03-14 14:45:00.000000000 +0000
321 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
322 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
323 'OBJECT' => 'IMAP.o',
324 - 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
325 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
326 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
327 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
328 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC",
329 'EXE_FILES' => [cyradm],
330 --- cyrus-imapd-2.2.6/perl/sieve/lib/Makefile.in.orig 2004-05-28 20:03:07.000000000 +0200
331 +++ cyrus-imapd-2.2.6/perl/sieve/lib/Makefile.in 2004-07-25 20:10:30.304685256 +0200
337 +top_builddir = @top_builddir@
339 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
340 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
341 -LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
342 +LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
343 IMAP_LIBS = @IMAP_LIBS@
344 -DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
345 +DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
347 MAKEDEPEND_CFLAGS = @CFLAGS@
348 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
350 exec_prefix = @exec_prefix@
351 cyrus_prefix = @cyrus_prefix@
353 -OBJS=isieve.o lex.o mystring.o request.o
354 +OBJS=isieve.lo lex.lo mystring.lo request.lo
362 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
364 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
366 -libisieve.a: $(OBJS)
368 - ar cr libisieve.a $(OBJS)
369 - $(RANLIB) libisieve.a
370 +libisieve.la: $(OBJS)
371 + $(LIBTOOL) --mode=link $(CC) -o libisievie.la $(OBJS)
374 rm -f *.o Makefile.bak makedepend.log libisieve.a
375 --- cyrus-imapd-2.2.3/perl/sieve/managesieve/Makefile.PL.orig 2003-10-22 18:50:27.000000000 +0000
376 +++ cyrus-imapd-2.2.3/perl/sieve/managesieve/Makefile.PL 2004-03-14 14:50:22.000000000 +0000
378 'NAME' => 'Cyrus::SIEVE::managesieve',
379 'ABSTRACT' => 'Cyurs Sieve management interface',
380 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
381 - 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
382 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
383 + 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
384 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
385 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
386 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
387 --- cyrus-imapd-2.2.3/depot/Makefile.in.orig 2003-10-22 18:02:51.000000000 +0000
388 +++ cyrus-imapd-2.2.3/depot/Makefile.in 2004-03-14 14:50:48.000000000 +0000
391 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
393 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
394 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
398 --- cyrus-imapd-2.2.6/sieve/Makefile.in.orig 2004-05-28 20:03:09.000000000 +0200
399 +++ cyrus-imapd-2.2.6/sieve/Makefile.in 2004-07-25 20:13:56.311367480 +0200
405 +top_builddir = @top_builddir@
406 COMPILE_ET = @COMPILE_ET@
410 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
411 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
412 LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
413 -DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
414 +DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
416 BUILT_SOURCES = addr.c addr.h addr-lex.c \
417 sieve.c sieve.h sieve-lex.c \
421 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
422 - $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
423 + $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c sievec $(DESTDIR)$(service_path) || exit
425 test: $(DEPLIBS) libsieve.a test.o
426 - $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
427 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
430 sieve.o sieve-lex.o comparator.o interp.o message.o \
431 @@ -102,10 +104,10 @@
434 sievec: sievec.o libsieve.a
435 - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
436 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
438 sieved: sieved.o libsieve.a
439 - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
440 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
443 sieve_interface.h: sieve_err.h
444 --- cyrus-imapd-2.2.3/timsieved/Makefile.in.orig 2003-11-12 04:02:14.000000000 +0000
445 +++ cyrus-imapd-2.2.3/timsieved/Makefile.in 2004-03-14 14:54:40.000000000 +0000
451 +top_builddir = @top_builddir@
454 CYRUS_USER=@cyrus_user@
456 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
457 LIB_WRAP = @LIB_WRAP@
458 LIBS = $(IMAP_COM_ERR_LIBS)
459 -DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
460 +DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
462 PURIFY=/usr/local/bin/purify
468 - $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
469 + $(LIBTOOL) --mode=install $(INSTALL) timsieved $(DESTDIR)$(service_path)
471 OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
474 timsieved: $(OBJS) $(SERVICE)
475 - $(CC) $(LDFLAGS) -o timsieved \
476 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved \
477 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
479 timsieved.pure: $(OBJS) $(SERVICE)
480 $(PURIFY) $(PUREOPT) \
481 - $(CC) $(LDFLAGS) -o timsieved.pure \
482 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved.pure \
483 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
486 --- cyrus-imapd-2.2.3/installsieve/Makefile.in.orig 2003-10-22 18:50:11.000000000 +0000
487 +++ cyrus-imapd-2.2.3/installsieve/Makefile.in 2004-03-14 14:55:58.000000000 +0000
493 +top_builddir = @top_builddir@
496 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
499 IMAP_LIBS = @IMAP_LIBS@
501 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
502 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
505 exec_prefix = @exec_prefix@
510 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
511 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
513 OBJS=lex.o mystring.o request.o isieve.o
516 $(RANLIB) libinstallsieve.a
518 installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
519 - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
520 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
523 rm -f *.o *.a Makefile.bak makedepend.log
524 --- cyrus-imapd-2.2.3/netnews/Makefile.in.orig 2003-11-12 04:02:08.000000000 +0000
525 +++ cyrus-imapd-2.2.3/netnews/Makefile.in 2004-03-14 14:57:58.000000000 +0000
531 +top_builddir = @top_builddir@
534 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
535 LIBS = @IMAP_LIBS@ @LIB_RT@
536 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
537 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
545 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
546 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
549 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
551 remotepurge: $(OBJS) $(DEPLIBS)
552 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
553 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
557 --- cyrus-imapd-2.2.6/configure.in.orig 2004-07-25 19:28:56.114859744 +0200
558 +++ cyrus-imapd-2.2.6/configure.in 2004-07-25 20:14:16.360319576 +0200
560 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
569 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
571 if test $cyrus_cv_getaddrinfo = no; then
572 - IPV6_OBJS="getaddrinfo.o"
573 + IPV6_OBJS="getaddrinfo.lo"
576 cyrus_cv_getnameinfo=yes
578 cyrus_cv_getnameinfo=no)
580 if test $cyrus_cv_getnameinfo = no; then
581 - IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
582 + IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
585 IPv6_CHECK_SS_FAMILY()
587 dnl function for doing each of the database backends
588 dnl parameters: backend name, variable to set, withval
590 -CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
591 +CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
593 dnl Berkeley DB Detection
596 LIBS="${LIBS} ${BDB_LIBADD}"
597 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
599 - CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
600 + CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
601 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
604 --- cyrus-imapd-2.2.6/imtest/Makefile.in.orig 2004-05-28 20:03:03.000000000 +0200
605 +++ cyrus-imapd-2.2.6/imtest/Makefile.in 2004-07-25 20:14:57.524061736 +0200
611 +top_builddir = @top_builddir@
613 DEFS = @DEFS@ @LOCALDEFS@
614 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
616 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
617 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
618 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
621 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
626 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
627 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
628 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
629 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
630 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
632 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
634 imtest: imtest.o $(DEPLIBS)
635 - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
636 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
638 imtest.pure: imtest.o $(DEPLIBS)
639 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
640 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
643 rm -f *.o Makefile.bak makedepend.log imtest
644 --- cyrus-imapd-2.2.3/master/Makefile.in.orig 2003-11-12 04:02:03.000000000 +0000
645 +++ cyrus-imapd-2.2.3/master/Makefile.in 2004-03-14 15:01:44.000000000 +0000
651 +top_builddir = @top_builddir@
653 CYRUS_USER=@cyrus_user@
654 CYRUS_GROUP=@cyrus_group@
658 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
659 -LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
660 +LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
663 MAKEDEPEND = @MAKEDEPEND@
665 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
666 for file in $(PROGS); \
668 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
669 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
676 master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
677 - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
678 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
681 rm -f *.o *.a Makefile.bak $(PROGS)
682 --- cyrus-imapd-2.2.3/notifyd/Makefile.in.orig 2003-11-12 04:02:10.000000000 +0000
683 +++ cyrus-imapd-2.2.3/notifyd/Makefile.in 2004-03-14 15:03:34.000000000 +0000
689 +top_builddir = @top_builddir@
692 CYRUS_USER=@cyrus_user@
694 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
695 LIB_WRAP = @LIB_WRAP@
696 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
697 -DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
698 +DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
700 PURIFY=/usr/local/bin/purify
706 - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
707 + $(LIBTOOL) --mode=install $(INSTALL) notifyd $(DESTDIR)$(service_path)
709 OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
711 notifytest: notifytest.o
712 - $(CC) $(LDFLAGS) -o notifytest \
713 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifytest \
714 notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
716 notifyd: $(OBJS) $(SERVICE)
717 - $(CC) $(LDFLAGS) -o notifyd \
718 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd \
719 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
721 notifyd.pure: $(OBJS) $(SERVICE)
722 $(PURIFY) $(PUREOPT) \
723 - $(CC) $(LDFLAGS) -o notifyd.pure \
724 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd.pure \
725 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
728 --- cyrus-imapd-2.2.6/ptclient/Makefile.in.orig 2004-05-28 20:03:08.000000000 +0200
729 +++ cyrus-imapd-2.2.6/ptclient/Makefile.in 2004-07-25 20:17:40.561276312 +0200
735 +top_builddir = @top_builddir@
738 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
740 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
741 LIB_SASL = @LIB_SASL@
742 LIB_WRAP = @LIB_WRAP@
743 -DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
744 +DEPLIBS = ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
745 UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
747 LDAP_LIBS=@LDAP_LIBS@
752 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
753 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
754 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
755 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
756 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
757 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
760 $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
762 ptloader: ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(DEPLIBS)
763 - $(CC) $(LDFLAGS) -o $@ ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
764 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
766 ptloader.pure: ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(DEPLIBS)
767 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
768 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
770 ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
771 - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
772 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
774 ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
775 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
776 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
778 ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
779 - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
780 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
782 ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
783 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
784 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
786 ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
787 - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
788 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
791 rm -f *.o Makefile.bak $(PROGS) makedepend.log
792 --- cyrus-imapd-2.2.3/sieve/sieved.c.orig 2003-10-22 18:03:25.000000000 +0000
793 +++ cyrus-imapd-2.2.3/sieve/sieved.c 2004-03-14 15:54:34.000000000 +0000
796 int unwrap_string(bytecode_input_t *bc, int pos, const char **str, int *len);
798 +/* config.c stuff */
799 +const int config_need_data = 0;
801 /*this is called by xmalloc*/
802 void fatal(const char *s, int code)
804 --- cyrus-imapd-2.2.3/imtest/imtest.c.orig 2004-01-03 15:14:29.000000000 +0000
805 +++ cyrus-imapd-2.2.3/imtest/imtest.c 2004-03-14 16:20:47.000000000 +0000
810 +/* config.c stuff */
811 +const int config_need_data = 0;
813 int mysasl_config(void *context __attribute__((unused)),
814 const char *plugin_name,
816 --- cyrus-imapd-2.2.3/perl/imap/IMAP.xs.orig 2003-11-25 21:28:23.000000000 +0000
817 +++ cyrus-imapd-2.2.3/perl/imap/IMAP.xs 2004-03-14 17:13:48.000000000 +0000
822 +const int config_need_data = 0;
825 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
826 --- cyrus-imapd-2.2.3/perl/sieve/managesieve/managesieve.xs.orig 2003-10-22 18:50:27.000000000 +0000
827 +++ cyrus-imapd-2.2.3/perl/sieve/managesieve/managesieve.xs 2004-03-14 17:12:50.000000000 +0000
829 croak("failure: %s", s);
832 +const int config_need_data = 0;
835 perlsieve_getpass(conn, context, id, psecret)