]> git.pld-linux.org Git - packages/cyrus-imapd.git/blame - cyrus-imapd-shared.patch
projects / packages / cyrus-imapd.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- tabs in preamble
[packages/cyrus-imapd.git] / cyrus-imapd-shared.patch
CommitLineData
b072b889
JB		 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
32bec8aa
JB		 3@@ -43,10 +43,10 @@
4 # $Id$
5
6 # Authorization namespace.
7-AUTH=auth_@WITH_AUTH@.o
8+AUTH=auth_@WITH_AUTH@.lo
9
10 # ACL interpretation. Only one choice for now:
11-ACL=acl_afs.o
12+ACL=acl_afs.lo
13
14 srcdir = @srcdir@
b072b889
JB		 15 top_srcdir = @top_srcdir@
16@@ -56,6 +56,8 @@
32bec8aa
JB		 17
18 INSTALL = @INSTALL@
19 RANLIB = @RANLIB@
20+LIBTOOL = @LIBTOOL@
21+top_builddir = @top_builddir@
22
23 DEFS = @DEFS@ @LOCALDEFS@
24 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
b072b889 25@@ -71,6 +73,7 @@
32bec8aa
JB		 26 prefix = @prefix@
27 exec_prefix = @exec_prefix@
28 cyrus_prefix = @cyrus_prefix@
29+libdir = @libdir@
30
b072b889 31 libdir = @libdir@
32bec8aa 32
b072b889 33@@ -87,26 +90,26 @@
32bec8aa
JB		 34 $(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
35 $(srcdir)/libcyr_cfg.h
36
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@ \
28170c65 43- iptostring.o xmalloc.o wildmat.o
32bec8aa
JB		 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@ \
28170c65 50+ iptostring.lo xmalloc.lo wildmat.lo
32bec8aa
JB		 51
52 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
53 $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
54 imapopts.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@
59
60-all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
61+all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
62
63 install:
b072b889
JB		 64 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
65- $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
66- $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
32bec8aa
JB		 67+ $(LIBTOOL) --mode=install $(INSTALL) libcyrus.la $(DESTDIR)$(libdir)
68+ $(LIBTOOL) --mode=install $(INSTALL) libcyrus_min.la $(DESTDIR)$(libdir)
b072b889 69 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
32bec8aa
JB		 70 for file in $(LIBCYR_HDRS); \
71 do \
b072b889 72@@ -117,19 +120,15 @@
32bec8aa
JB		 73 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
74 done
75
76-.c.o:
b072b889 77- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
32bec8aa 78+%.lo: %.c
b072b889 79+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
32bec8aa
JB		 80 $<
81
82-libcyrus.a: $(LIBCYR_OBJS)
83- rm -f libcyrus.a
84- ar cr libcyrus.a $(LIBCYR_OBJS)
85- $(RANLIB) libcyrus.a
86-
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)
93+
94+libcyrus_min.la: $(LIBCYRM_OBJS)
95+ $(LIBTOOL) --mode=link $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
96
97 imapopts.c: imapoptions $(srcdir)/../tools/config2header
b072b889
JB		 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
101@@ -57,6 +57,8 @@
32bec8aa
JB		 102 CC = @CC@
103 INSTALL = @INSTALL@
104 RANLIB = @RANLIB@
105+LIBTOOL = @LIBTOOL@
106+top_builddir = @top_builddir@
107 AWK = @AWK@
108
109 CYRUS_USER=@cyrus_user@
b072b889 110@@ -70,7 +72,7 @@
32bec8aa
JB		 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@
116
117 CFLAGS = @CFLAGS@
118 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
b072b889 119@@ -137,7 +139,7 @@
32bec8aa
JB		 120 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
121 for file in $(PROGS); \
122 do \
123- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
124+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
125 done
126 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
127
b072b889 128@@ -187,156 +189,156 @@
32bec8aa
JB		 129
130 ### Services
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)
135
b072b889 136 lmtpd: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) \
32bec8aa
JB		 137 $(DEPLIBS) $(SERVICE)
138- $(CC) $(LDFLAGS) -o lmtpd \
139+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd \
b072b889 140 $(SERVICE) lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
32bec8aa
JB		 141 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
142
b072b889 143 lmtpd.pure: lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
32bec8aa
JB		 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 \
b072b889 147 $(SERVICE) lmtpd.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
32bec8aa
JB		 148 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
149
b072b889 150 lmtpproxyd: lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
32bec8aa
JB		 151 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
152- $(CC) $(LDFLAGS) -o lmtpproxyd \
153+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpproxyd \
b072b889 154 $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
32bec8aa
JB		 155 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
156
b072b889 157 lmtpproxyd.pure: lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
32bec8aa
JB		 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 \
b072b889 161 $(SERVICE) lmtpproxyd.o backend.o $(LMTPOBJS) mutex_fake.o \
32bec8aa
JB		 162 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
163
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)
169
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)
175
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)
181
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)
187
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)
193
194 mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
195 libimap.a $(DEPLIBS)
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
201
202 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
203 libimap.a $(DEPLIBS)
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
208
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)
213
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)
220
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)
225
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)
230
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)
236
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)
241
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)
246
b072b889
JB		 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)
32bec8aa
JB		 251
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)
256
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)
261
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)
266
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)
271
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)
276
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)
281
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 \
285 $(DEPLIBS) $(LIBS)
286
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)
291
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)
296
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)
301
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)
306
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)
311
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)
316
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
320@@ -64,8 +64,7 @@
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],
b072b889
JB		 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
332@@ -49,12 +49,14 @@
32bec8aa
JB		 333 CC = @CC@
334 INSTALL = @INSTALL@
335 RANLIB = @RANLIB@
336+LIBTOOL = @LIBTOOL@
337+top_builddir = @top_builddir@
338
339 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
b072b889 340 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
32bec8aa
JB		 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@
346
b072b889
JB		 347 MAKEDEPEND_CFLAGS = @CFLAGS@
348 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
349@@ -67,19 +69,17 @@
32bec8aa
JB		 350 exec_prefix = @exec_prefix@
351 cyrus_prefix = @cyrus_prefix@
352
353-OBJS=isieve.o lex.o mystring.o request.o
354+OBJS=isieve.lo lex.lo mystring.lo request.lo
355
356-all: libisieve.a
357+all: libisieve.la
358
359 install:
360
361-.c.o:
362- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
363+%.lo: %.c
364+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
365
366-libisieve.a: $(OBJS)
367- rm -f libisieve.a
368- ar cr libisieve.a $(OBJS)
369- $(RANLIB) libisieve.a
370+libisieve.la: $(OBJS)
371+ $(LIBTOOL) --mode=link $(CC) -o libisievie.la $(OBJS)
372
373 clean:
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
377@@ -59,7 +59,7 @@
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
389@@ -49,7 +49,7 @@
390 DEFS = @DEFS@
391 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
392 LIBS = @LIBS@
393-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
394+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
395
396 CFLAGS = -g
397 LDFLAGS = -g
b072b889
JB		 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
400@@ -35,6 +35,8 @@
32bec8aa
JB		 401 YFLAGS = -d
402 LEX = @LEX@
403 RANLIB = @RANLIB@
404+LIBTOOL = @LIBTOOL@
405+top_builddir = @top_builddir@
406 COMPILE_ET = @COMPILE_ET@
407
408 DEFS = @DEFS@
b072b889 409@@ -49,7 +51,7 @@
32bec8aa
JB		 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@
415
416 BUILT_SOURCES = addr.c addr.h addr-lex.c \
417 sieve.c sieve.h sieve-lex.c \
b072b889 418@@ -61,10 +63,10 @@
32bec8aa
JB		 419
420 install: sievec
421 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
b072b889
JB		 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
32bec8aa
JB		 424
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)
428
429 OBJS = sieve_err.o \
430 sieve.o sieve-lex.o comparator.o interp.o message.o \
b072b889 431@@ -102,10 +104,10 @@
32bec8aa
JB		 432 $(RANLIB) libsieve.a
433
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)
437
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)
441
442
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
446@@ -46,6 +46,8 @@
447
448 CC = @CC@
449 RANLIB = @RANLIB@
450+LIBTOOL = @LIBTOOL@
451+top_builddir = @top_builddir@
452
453 INSTALL = @INSTALL@
454 CYRUS_USER=@cyrus_user@
455@@ -71,7 +73,7 @@
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@
461
462 PURIFY=/usr/local/bin/purify
463 PUREOPT=-best-effort
464@@ -79,18 +81,18 @@
465 all: timsieved
466
467 install:
468- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
469+ $(LIBTOOL) --mode=install $(INSTALL) timsieved $(DESTDIR)$(service_path)
470
471 OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
472 ../imap/tls.o
473
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)
478
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)
484
485 clean:
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
488@@ -45,6 +45,8 @@
489
490 CC = @CC@
491 RANLIB = @RANLIB@
492+LIBTOOL = @LIBTOOL@
493+top_builddir = @top_builddir@
494
495 DEFS = @DEFS@
496 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
497@@ -57,7 +59,7 @@
498
499 IMAP_LIBS = @IMAP_LIBS@
500 LIBS =
501-DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
502+DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
503
504 prefix = @prefix@
505 exec_prefix = @exec_prefix@
506@@ -66,7 +68,7 @@
507 all: installsieve
508
509 install:
510- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
511+ $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
512
513 OBJS=lex.o mystring.o request.o isieve.o
514
515@@ -76,7 +78,7 @@
516 $(RANLIB) libinstallsieve.a
517
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)
521
522 clean:
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
526@@ -47,11 +47,13 @@
527 CC = @CC@
528 INSTALL = @INSTALL@
529 RANLIB = @RANLIB@
530+LIBTOOL = @LIBTOOL@
531+top_builddir = @top_builddir@
532
533 DEFS = @DEFS@
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@
538
539 CFLAGS = @CFLAGS@
540 LDFLAGS = @LDFLAGS@
541@@ -69,13 +71,13 @@
542 all: remotepurge
543
544 install:
545- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
546+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
547
548 .c.o:
549 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
550
551 remotepurge: $(OBJS) $(DEPLIBS)
552- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
553+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
554 $(DEPLIBS) $(LIBS)
555
556
b072b889
JB		 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
559@@ -86,7 +86,7 @@
32bec8aa
JB		 560 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
561
562 AC_PROG_CC
563-AC_PROG_RANLIB
564+AC_PROG_LIBTOOL
565 AC_PROG_MAKE_SET
566 AC_PROG_INSTALL
567 AC_AIX
b072b889 568@@ -120,7 +120,7 @@
32bec8aa
JB		 569 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
570
571 if test $cyrus_cv_getaddrinfo = no; then
572- IPV6_OBJS="getaddrinfo.o"
573+ IPV6_OBJS="getaddrinfo.lo"
574 fi
575
576 cyrus_cv_getnameinfo=yes
b072b889 577@@ -129,7 +129,7 @@
32bec8aa
JB		 578 cyrus_cv_getnameinfo=no)
579
580 if test $cyrus_cv_getnameinfo = no; then
581- IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
582+ IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
583 fi
584
585 IPv6_CHECK_SS_FAMILY()
b072b889 586@@ -163,7 +163,7 @@
32bec8aa
JB		 587 dnl function for doing each of the database backends
588 dnl parameters: backend name, variable to set, withval
589
b072b889
JB		 590-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
591+CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
32bec8aa
JB		 592
593 dnl Berkeley DB Detection
594
b072b889 595@@ -210,7 +210,7 @@
32bec8aa
JB		 596 LIBS="${LIBS} ${BDB_LIBADD}"
597 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
598
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?])
602 fi
603
b072b889
JB		 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
606@@ -49,12 +49,14 @@
32bec8aa
JB		 607 CC = @CC@
608 INSTALL = @INSTALL@
609 RANLIB = @RANLIB@
610+LIBTOOL = @LIBTOOL@
611+top_builddir = @top_builddir@
612
613 DEFS = @DEFS@ @LOCALDEFS@
b072b889 614 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
32bec8aa
JB		 615 LIBS = @LIBS@
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@
619
b072b889
JB		 620 CFLAGS = @CFLAGS@
621 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
622@@ -72,7 +74,7 @@
32bec8aa
JB		 623 all: imtest
624
625 install:
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
b072b889 631@@ -84,10 +86,10 @@
32bec8aa
JB		 632 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
633
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)
637
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)
641
642 clean:
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
646@@ -48,6 +48,8 @@
647 CC = @CC@
648 INSTALL = @INSTALL@
649 RANLIB = @RANLIB@
650+LIBTOOL = @LIBTOOL@
651+top_builddir = @top_builddir@
652
653 CYRUS_USER=@cyrus_user@
654 CYRUS_GROUP=@cyrus_group@
655@@ -58,7 +60,7 @@
656
657 CFLAGS = @CFLAGS@
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@
661
662 SHELL = /bin/sh
663 MAKEDEPEND = @MAKEDEPEND@
664@@ -78,7 +80,7 @@
665 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
666 for file in $(PROGS); \
667 do \
668- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
669+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
670 done
671
672 .c.o:
673@@ -86,7 +88,7 @@
674 $<
675
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)
679
680 clean:
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
684@@ -46,6 +46,8 @@
685
686 CC = @CC@
687 RANLIB = @RANLIB@
688+LIBTOOL = @LIBTOOL@
689+top_builddir = @top_builddir@
690
691 INSTALL = @INSTALL@
692 CYRUS_USER=@cyrus_user@
693@@ -71,7 +73,7 @@
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@
699
700 PURIFY=/usr/local/bin/purify
701 PUREOPT=-best-effort
702@@ -79,21 +81,21 @@
703 all: notifyd
704
705 install:
706- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
707+ $(LIBTOOL) --mode=install $(INSTALL) notifyd $(DESTDIR)$(service_path)
708
709 OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
710
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)
715
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)
720
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)
726
727 clean:
b072b889
JB		 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
730@@ -51,6 +51,8 @@
32bec8aa
JB		 731 CC = @CC@
732 INSTALL = @INSTALL@
733 RANLIB = @RANLIB@
734+LIBTOOL = @LIBTOOL@
735+top_builddir = @top_builddir@
736
737 DEFS = @DEFS@
738 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
b072b889 739@@ -60,7 +62,7 @@
32bec8aa
JB		 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
746
747 LDAP_LIBS=@LDAP_LIBS@
b072b889 748@@ -89,33 +91,33 @@
32bec8aa
JB		 749 all: $(PROGS)
750
751 install:
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)
758
759 .c.o:
760 $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
761
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)
765
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)
769
770 ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
b072b889
JB		 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)
32bec8aa
JB		 773
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)
777
778 ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
b072b889
JB		 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)
32bec8aa
JB		 781
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)
785
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)
789
790 clean:
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
794@@ -48,6 +48,9 @@
795 /* from bc_eval.c */
796 int unwrap_string(bytecode_input_t *bc, int pos, const char **str, int *len);
797
798+/* config.c stuff */
799+const int config_need_data = 0;
800+
801 /*this is called by xmalloc*/
802 void fatal(const char *s, int code)
803 {
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
806@@ -268,6 +268,9 @@
807 imtest_fatal(msg);
808 }
809
810+/* config.c stuff */
811+const int config_need_data = 0;
812+
813 int mysasl_config(void *context __attribute__((unused)),
814 const char *plugin_name,
815 const char *option,
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
818@@ -74,6 +74,7 @@
819 {
820 croak(s);
821 }
822+const int config_need_data = 0;
823
824 /*
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
828@@ -96,6 +96,7 @@
829 croak("failure: %s", s);
830 exit(-1);
831 }
832+const int config_need_data = 0;
833
834 static int
835 perlsieve_getpass(conn, context, id, psecret)
High-performance mail store with IMAP and POP3
This page took 0.794803 seconds and 4 git commands to generate.