]> 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
- updated mandir patch so overriding mandir on install is no longer necessary
[packages/cyrus-imapd.git] / cyrus-imapd-shared.patch
CommitLineData
32bec8aa
JB		 1--- cyrus-imapd-2.2.3/lib/Makefile.in.orig 2004-01-03 15:16:44.000000000 +0000
2+++ cyrus-imapd-2.2.3/lib/Makefile.in 2004-03-14 14:48:11.000000000 +0000
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@
15 VPATH = @srcdir@
16@@ -55,6 +55,8 @@
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@
25@@ -69,6 +71,7 @@
26 prefix = @prefix@
27 exec_prefix = @exec_prefix@
28 cyrus_prefix = @cyrus_prefix@
29+libdir = @libdir@
30
31 BUILTSOURCES = imapopts.h imapopts.c
32
33@@ -83,27 +86,26 @@
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@ \
43+LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
44+ libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
45+ lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
46+ chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
47+ gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
48+ @LTLIBOBJS@ @CYRUSDB_OBJS@ \
49 iptostring.o xmalloc.o wildmat.o
50
51 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
52 $(srcdir)/strhash.o $(srcdir)/libconfig.h $(srcdir)/assert.h \
53 imapopts.h
54-LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
55- assert.o @IPV6_OBJS@
56+LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
57+ assert.lo @IPV6_OBJS@
58
59-all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
60+all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
61
62 install:
63- $(srcdir)/../install-sh -d $(DESTDIR)$(exec_prefix)/lib
64- $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(exec_prefix)/lib
65- $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(exec_prefix)/lib
66- $(RANLIB) $(DESTDIR)$(exec_prefix)/lib/libcyrus.a
67+ $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
68+ $(LIBTOOL) --mode=install $(INSTALL) libcyrus.la $(DESTDIR)$(libdir)
69+ $(LIBTOOL) --mode=install $(INSTALL) libcyrus_min.la $(DESTDIR)$(libdir)
70 for file in $(LIBCYR_HDRS); \
71 do \
72 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
73@@ -113,19 +115,15 @@
74 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
75 done
76
77-.c.o:
78- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
79+%.lo: %.c
80+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
81 $<
82
83-libcyrus.a: $(LIBCYR_OBJS)
84- rm -f libcyrus.a
85- ar cr libcyrus.a $(LIBCYR_OBJS)
86- $(RANLIB) libcyrus.a
87-
88-libcyrus_min.a: $(LIBCYRM_OBJS)
89- rm -f libcyrus_min.a
90- ar cr libcyrus_min.a $(LIBCYRM_OBJS)
91- $(RANLIB) libcyrus_min.a
92+libcyrus.la: $(LIBCYR_OBJS)
93+ $(LIBTOOL) --mode=link $(CC) -o libcyrus.la $(LIBCYR_OBJS) @LIBS@ @LIB_SASL@ -rpath $(libdir)
94+
95+libcyrus_min.la: $(LIBCYRM_OBJS)
96+ $(LIBTOOL) --mode=link $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
97
98 imapopts.c: imapoptions $(srcdir)/../tools/config2header
99 $(srcdir)/../tools/config2header $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
100--- cyrus-imapd-2.2.3/man/Makefile.in.orig 2004-03-02 22:00:32.000000000 +0000
101+++ cyrus-imapd-2.2.3/man/Makefile.in 2004-03-14 14:35:32.000000000 +0000
102@@ -52,7 +52,7 @@
103 DEFS = @DEFS@
104 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
105 LIBS = @LIBS@
106-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
107+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
108
109 CFLAGS = -g
110 LDFLAGS = -g
111--- cyrus-imapd-2.2.3/imap/Makefile.in.orig 2003-11-12 04:02:01.000000000 +0000
112+++ cyrus-imapd-2.2.3/imap/Makefile.in 2004-03-14 14:41:46.000000000 +0000
113@@ -56,6 +56,8 @@
114 CC = @CC@
115 INSTALL = @INSTALL@
116 RANLIB = @RANLIB@
117+LIBTOOL = @LIBTOOL@
118+top_builddir = @top_builddir@
119 AWK = @AWK@
120
121 CYRUS_USER=@cyrus_user@
122@@ -68,7 +70,7 @@
123 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
124 LIB_WRAP = @LIB_WRAP@
125 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
126-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
127+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
128
129 CFLAGS = @CFLAGS@
130 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
131@@ -135,7 +137,7 @@
132 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
133 for file in $(PROGS); \
134 do \
135- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
136+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
137 done
138 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
139
140@@ -185,156 +187,156 @@
141
142 ### Services
143 idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
144- $(CC) $(LDFLAGS) -o idled \
145+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o idled \
146 idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
147
148 lmtpd: lmtpd.o $(LMTPOBJS) mutex_fake.o libimap.a $(SIEVE_LIBS) \
149 $(DEPLIBS) $(SERVICE)
150- $(CC) $(LDFLAGS) -o lmtpd \
151+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd \
152 $(SERVICE) lmtpd.o $(LMTPOBJS) mutex_fake.o \
153 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
154
155 lmtpd.pure: lmtpd.o $(LMTPOBJS) mutex_fake.o \
156 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
157- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
158+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpd.pure \
159 $(SERVICE) lmtpd.o $(LMTPOBJS) mutex_fake.o \
160 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
161
162 lmtpproxyd: lmtpproxyd.o $(LMTPOBJS) mutex_fake.o \
163 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
164- $(CC) $(LDFLAGS) -o lmtpproxyd \
165+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpproxyd \
166 $(SERVICE) lmtpproxyd.o $(LMTPOBJS) mutex_fake.o \
167 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
168
169 lmtpproxyd.pure: lmtpproxyd.o $(LMTPOBJS) mutex_fake.o \
170 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
171- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpproxyd.pure \
172+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o lmtpproxyd.pure \
173 $(SERVICE) lmtpproxyd.o $(LMTPOBJS) mutex_fake.o \
174 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
175
176 imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
177- $(CC) $(LDFLAGS) -o imapd \
178+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd \
179 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
180 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
181
182 imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
183- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
184+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd.pure \
185 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
186 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
187
188 imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
189- $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
190+ $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imapd.quant \
191 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
192 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
193
194 proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
195- $(CC) $(LDFLAGS) -o proxyd \
196+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o proxyd \
197 $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
198 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
199
200 proxyd.pure: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
201- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o proxyd.pure \
202+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o proxyd.pure \
203 $(SERVICE) $(PROXYDOBJS) mutex_fake.o libimap.a \
204 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
205
206 mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
207 libimap.a $(DEPLIBS)
208- $(CC) $(LDFLAGS) -o mupdate \
209+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mupdate \
210 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
211 mutex_pthread.o tls.o libimap.a \
212 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
213
214 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
215 libimap.a $(DEPLIBS)
216- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
217+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mupdate.pure \
218 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
219 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
220
221 pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
222- $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
223+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
224 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
225
226 nntpd: nntpd.o backend.o index.o smtpclient.o spool.o tls.o \
227 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
228- $(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \
229+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o nntpd nntpd.o backend.o index.o spool.o \
230 smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
231 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
232
233 fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
234- $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
235+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
236 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
237
238 smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
239- $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
240+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
241 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
242
243 ### Command Line Utilities
244 arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
245- $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
246+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
247 libimap.a $(DEPLIBS) $(LIBS)
248
249 cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
250- $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
251+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
252 libimap.a $(DEPLIBS) $(LIBS)
253
254 chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
255- $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
256+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
257 libimap.a $(DEPLIBS) $(LIBS)
258
259 deliver: deliver.o $(LMTPOBJS) mutex_fake.o libimap.a $(DEPLIBS)
260- $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) mutex_fake.o \
261+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) mutex_fake.o \
262 libimap.a $(DEPLIBS) $(LIBS)
263
264 ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
265- $(CC) $(LDFLAGS) -o \
266+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
267 $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
268
269 ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
270- $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
271+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
272 libimap.a $(DEPLIBS) $(LIBS)
273
274 ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
275- $(CC) $(LDFLAGS) -o \
276+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
277 $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
278
279 cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
280- $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
281+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
282 libimap.a $(DEPLIBS) $(LIBS)
283
284 fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
285- $(CC) $(LDFLAGS) -o \
286+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
287 $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
288
289 squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
290- $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
291+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
292 $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
293
294 mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
295- $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
296+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
297 $(DEPLIBS) $(LIBS)
298
299 ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
300- $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
301+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
302 libimap.a $(DEPLIBS) $(LIBS)
303
304 cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
305- $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
306+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
307 libimap.a $(DEPLIBS) $(LIBS)
308
309 mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
310- $(CC) $(LDFLAGS) -o \
311+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
312 mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
313
314 reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
315- $(CC) $(LDFLAGS) -o \
316+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
317 reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
318
319 quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
320- $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
321+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
322 libimap.a $(DEPLIBS) $(LIBS)
323
324 tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
325- $(CC) $(LDFLAGS) -o \
326+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o \
327 $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
328
329 ### Other Misc Targets
330--- cyrus-imapd-2.2.3/perl/imap/Makefile.PL.orig 2003-10-22 18:50:18.000000000 +0000
331+++ cyrus-imapd-2.2.3/perl/imap/Makefile.PL 2004-03-14 14:45:00.000000000 +0000
332@@ -64,8 +64,7 @@
333 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
334 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
335 'OBJECT' => 'IMAP.o',
336- 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
337- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
338+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
339 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
340 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC",
341 'EXE_FILES' => [cyradm],
342--- cyrus-imapd-2.2.3/perl/sieve/lib/Makefile.in.orig 2004-01-03 15:16:45.000000000 +0000
343+++ cyrus-imapd-2.2.3/perl/sieve/lib/Makefile.in 2004-03-14 14:47:42.000000000 +0000
344@@ -48,15 +48,17 @@
345 CC = @CC@
346 INSTALL = @INSTALL@
347 RANLIB = @RANLIB@
348+LIBTOOL = @LIBTOOL@
349+top_builddir = @top_builddir@
350
351 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
352 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@
353-LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
354+LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
355 IMAP_LIBS = @IMAP_LIBS@
356-DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
357+DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
358
359-CFLAGS = -g
360-LDFLAGS = -g @LDFLAGS@
361+CFLAGS = @CFLAGS@
362+LDFLAGS = @LDFLAGS@
363
364 SHELL = /bin/sh
365 MAKEDEPEND = @MAKEDEPEND@
366@@ -65,19 +67,17 @@
367 exec_prefix = @exec_prefix@
368 cyrus_prefix = @cyrus_prefix@
369
370-OBJS=isieve.o lex.o mystring.o request.o
371+OBJS=isieve.lo lex.lo mystring.lo request.lo
372
373-all: libisieve.a
374+all: libisieve.la
375
376 install:
377
378-.c.o:
379- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
380+%.lo: %.c
381+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
382
383-libisieve.a: $(OBJS)
384- rm -f libisieve.a
385- ar cr libisieve.a $(OBJS)
386- $(RANLIB) libisieve.a
387+libisieve.la: $(OBJS)
388+ $(LIBTOOL) --mode=link $(CC) -o libisievie.la $(OBJS)
389
390 clean:
391 rm -f *.o Makefile.bak makedepend.log libisieve.a
392--- cyrus-imapd-2.2.3/perl/sieve/managesieve/Makefile.PL.orig 2003-10-22 18:50:27.000000000 +0000
393+++ cyrus-imapd-2.2.3/perl/sieve/managesieve/Makefile.PL 2004-03-14 14:50:22.000000000 +0000
394@@ -59,7 +59,7 @@
395 'NAME' => 'Cyrus::SIEVE::managesieve',
396 'ABSTRACT' => 'Cyurs Sieve management interface',
397 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
398- 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
399- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
400+ 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
401+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
402 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
403 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
404--- cyrus-imapd-2.2.3/depot/Makefile.in.orig 2003-10-22 18:02:51.000000000 +0000
405+++ cyrus-imapd-2.2.3/depot/Makefile.in 2004-03-14 14:50:48.000000000 +0000
406@@ -49,7 +49,7 @@
407 DEFS = @DEFS@
408 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
409 LIBS = @LIBS@
410-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
411+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
412
413 CFLAGS = -g
414 LDFLAGS = -g
415--- cyrus-imapd-2.2.3/sieve/Makefile.in.orig 2003-11-12 04:02:12.000000000 +0000
416+++ cyrus-imapd-2.2.3/sieve/Makefile.in 2004-03-14 14:52:53.000000000 +0000
417@@ -34,6 +34,8 @@
418 YFLAGS = -d
419 LEX = @LEX@
420 RANLIB = @RANLIB@
421+LIBTOOL = @LIBTOOL@
422+top_builddir = @top_builddir@
423 COMPILE_ET = @COMPILE_ET@
424
425 DEFS = @DEFS@
426@@ -47,7 +49,7 @@
427 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
428 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
429 LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
430-DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
431+DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
432
433 BUILT_SOURCES = addr.c addr.h addr-lex.c \
434 sieve.c sieve.h sieve-lex.c \
435@@ -59,10 +61,10 @@
436
437 install: sievec
438 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
439- $(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit
440+ $(LIBTOOL) --mode=install $(srcdir)/../install-sh sievec $(DESTDIR)$(service_path) || exit
441
442 test: $(DEPLIBS) libsieve.a test.o
443- $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
444+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
445
446 OBJS = sieve_err.o \
447 sieve.o sieve-lex.o comparator.o interp.o message.o \
448@@ -100,10 +102,10 @@
449 $(RANLIB) libsieve.a
450
451 sievec: sievec.o libsieve.a
452- $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
453+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
454
455 sieved: sieved.o libsieve.a
456- $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
457+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
458
459
460 sieve_interface.h: sieve_err.h
461--- cyrus-imapd-2.2.3/timsieved/Makefile.in.orig 2003-11-12 04:02:14.000000000 +0000
462+++ cyrus-imapd-2.2.3/timsieved/Makefile.in 2004-03-14 14:54:40.000000000 +0000
463@@ -46,6 +46,8 @@
464
465 CC = @CC@
466 RANLIB = @RANLIB@
467+LIBTOOL = @LIBTOOL@
468+top_builddir = @top_builddir@
469
470 INSTALL = @INSTALL@
471 CYRUS_USER=@cyrus_user@
472@@ -71,7 +73,7 @@
473 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
474 LIB_WRAP = @LIB_WRAP@
475 LIBS = $(IMAP_COM_ERR_LIBS)
476-DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
477+DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
478
479 PURIFY=/usr/local/bin/purify
480 PUREOPT=-best-effort
481@@ -79,18 +81,18 @@
482 all: timsieved
483
484 install:
485- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
486+ $(LIBTOOL) --mode=install $(INSTALL) timsieved $(DESTDIR)$(service_path)
487
488 OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
489 ../imap/tls.o
490
491 timsieved: $(OBJS) $(SERVICE)
492- $(CC) $(LDFLAGS) -o timsieved \
493+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved \
494 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
495
496 timsieved.pure: $(OBJS) $(SERVICE)
497 $(PURIFY) $(PUREOPT) \
498- $(CC) $(LDFLAGS) -o timsieved.pure \
499+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved.pure \
500 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
501
502 clean:
503--- cyrus-imapd-2.2.3/installsieve/Makefile.in.orig 2003-10-22 18:50:11.000000000 +0000
504+++ cyrus-imapd-2.2.3/installsieve/Makefile.in 2004-03-14 14:55:58.000000000 +0000
505@@ -45,6 +45,8 @@
506
507 CC = @CC@
508 RANLIB = @RANLIB@
509+LIBTOOL = @LIBTOOL@
510+top_builddir = @top_builddir@
511
512 DEFS = @DEFS@
513 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
514@@ -57,7 +59,7 @@
515
516 IMAP_LIBS = @IMAP_LIBS@
517 LIBS =
518-DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
519+DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
520
521 prefix = @prefix@
522 exec_prefix = @exec_prefix@
523@@ -66,7 +68,7 @@
524 all: installsieve
525
526 install:
527- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
528+ $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
529
530 OBJS=lex.o mystring.o request.o isieve.o
531
532@@ -76,7 +78,7 @@
533 $(RANLIB) libinstallsieve.a
534
535 installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
536- $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
537+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
538
539 clean:
540 rm -f *.o *.a Makefile.bak makedepend.log
541--- cyrus-imapd-2.2.3/netnews/Makefile.in.orig 2003-11-12 04:02:08.000000000 +0000
542+++ cyrus-imapd-2.2.3/netnews/Makefile.in 2004-03-14 14:57:58.000000000 +0000
543@@ -47,11 +47,13 @@
544 CC = @CC@
545 INSTALL = @INSTALL@
546 RANLIB = @RANLIB@
547+LIBTOOL = @LIBTOOL@
548+top_builddir = @top_builddir@
549
550 DEFS = @DEFS@
551 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
552 LIBS = @IMAP_LIBS@ @LIB_RT@
553-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
554+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
555
556 CFLAGS = @CFLAGS@
557 LDFLAGS = @LDFLAGS@
558@@ -69,13 +71,13 @@
559 all: remotepurge
560
561 install:
562- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
563+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
564
565 .c.o:
566 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
567
568 remotepurge: $(OBJS) $(DEPLIBS)
569- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
570+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
571 $(DEPLIBS) $(LIBS)
572
573
574--- cyrus-imapd-2.2.3/configure.in.orig 2004-03-02 22:00:32.000000000 +0000
575+++ cyrus-imapd-2.2.3/configure.in 2004-03-14 14:34:05.000000000 +0000
576@@ -89,7 +89,7 @@
577 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
578
579 AC_PROG_CC
580-AC_PROG_RANLIB
581+AC_PROG_LIBTOOL
582 AC_PROG_MAKE_SET
583 AC_PROG_INSTALL
584 AC_AIX
585@@ -123,7 +123,7 @@
586 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
587
588 if test $cyrus_cv_getaddrinfo = no; then
589- IPV6_OBJS="getaddrinfo.o"
590+ IPV6_OBJS="getaddrinfo.lo"
591 fi
592
593 cyrus_cv_getnameinfo=yes
594@@ -132,7 +132,7 @@
595 cyrus_cv_getnameinfo=no)
596
597 if test $cyrus_cv_getnameinfo = no; then
598- IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
599+ IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
600 fi
601
602 IPv6_CHECK_SS_FAMILY()
603@@ -166,7 +166,7 @@
604 dnl function for doing each of the database backends
605 dnl parameters: backend name, variable to set, withval
606
607-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o"
608+CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo"
609
610 dnl Berkeley DB Detection
611
612@@ -213,7 +213,7 @@
613 LIBS="${LIBS} ${BDB_LIBADD}"
614 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
615
616- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
617+ CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
618 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
619 fi
620
621--- cyrus-imapd-2.2.3/imtest/Makefile.in.orig 2004-01-03 15:16:43.000000000 +0000
622+++ cyrus-imapd-2.2.3/imtest/Makefile.in 2004-03-14 15:00:16.000000000 +0000
623@@ -48,15 +48,17 @@
624 CC = @CC@
625 INSTALL = @INSTALL@
626 RANLIB = @RANLIB@
627+LIBTOOL = @LIBTOOL@
628+top_builddir = @top_builddir@
629
630 DEFS = @DEFS@ @LOCALDEFS@
631 CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @SASLFLAGS@
632 LIBS = @LIBS@
633 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
634-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
635+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
636
637-CFLAGS = -g
638-LDFLAGS = -g @LDFLAGS@
639+CFLAGS = @CFLAGS@
640+LDFLAGS = @LDFLAGS@
641
642 SHELL = /bin/sh
643 MAKEDEPEND = @MAKEDEPEND@
644@@ -71,7 +73,7 @@
645 all: imtest
646
647 install:
648- $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
649+ $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
650 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
651 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
652 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
653@@ -83,10 +85,10 @@
654 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
655
656 imtest: imtest.o $(DEPLIBS)
657- $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
658+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
659
660 imtest.pure: imtest.o $(DEPLIBS)
661- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
662+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
663
664 clean:
665 rm -f *.o Makefile.bak makedepend.log imtest
666--- cyrus-imapd-2.2.3/master/Makefile.in.orig 2003-11-12 04:02:03.000000000 +0000
667+++ cyrus-imapd-2.2.3/master/Makefile.in 2004-03-14 15:01:44.000000000 +0000
668@@ -48,6 +48,8 @@
669 CC = @CC@
670 INSTALL = @INSTALL@
671 RANLIB = @RANLIB@
672+LIBTOOL = @LIBTOOL@
673+top_builddir = @top_builddir@
674
675 CYRUS_USER=@cyrus_user@
676 CYRUS_GROUP=@cyrus_group@
677@@ -58,7 +60,7 @@
678
679 CFLAGS = @CFLAGS@
680 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
681-LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
682+LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
683
684 SHELL = /bin/sh
685 MAKEDEPEND = @MAKEDEPEND@
686@@ -78,7 +80,7 @@
687 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
688 for file in $(PROGS); \
689 do \
690- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
691+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
692 done
693
694 .c.o:
695@@ -86,7 +88,7 @@
696 $<
697
698 master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
699- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
700+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
701
702 clean:
703 rm -f *.o *.a Makefile.bak $(PROGS)
704--- cyrus-imapd-2.2.3/notifyd/Makefile.in.orig 2003-11-12 04:02:10.000000000 +0000
705+++ cyrus-imapd-2.2.3/notifyd/Makefile.in 2004-03-14 15:03:34.000000000 +0000
706@@ -46,6 +46,8 @@
707
708 CC = @CC@
709 RANLIB = @RANLIB@
710+LIBTOOL = @LIBTOOL@
711+top_builddir = @top_builddir@
712
713 INSTALL = @INSTALL@
714 CYRUS_USER=@cyrus_user@
715@@ -71,7 +73,7 @@
716 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
717 LIB_WRAP = @LIB_WRAP@
718 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
719-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
720+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
721
722 PURIFY=/usr/local/bin/purify
723 PUREOPT=-best-effort
724@@ -79,21 +81,21 @@
725 all: notifyd
726
727 install:
728- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
729+ $(LIBTOOL) --mode=install $(INSTALL) notifyd $(DESTDIR)$(service_path)
730
731 OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
732
733 notifytest: notifytest.o
734- $(CC) $(LDFLAGS) -o notifytest \
735+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifytest \
736 notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
737
738 notifyd: $(OBJS) $(SERVICE)
739- $(CC) $(LDFLAGS) -o notifyd \
740+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd \
741 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
742
743 notifyd.pure: $(OBJS) $(SERVICE)
744 $(PURIFY) $(PUREOPT) \
745- $(CC) $(LDFLAGS) -o notifyd.pure \
746+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd.pure \
747 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
748
749 clean:
750--- cyrus-imapd-2.2.3/ptclient/Makefile.in.orig 2003-11-12 04:02:11.000000000 +0000
751+++ cyrus-imapd-2.2.3/ptclient/Makefile.in 2004-03-14 15:05:38.000000000 +0000
752@@ -50,6 +50,8 @@
753 CC = @CC@
754 INSTALL = @INSTALL@
755 RANLIB = @RANLIB@
756+LIBTOOL = @LIBTOOL@
757+top_builddir = @top_builddir@
758
759 DEFS = @DEFS@
760 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
761@@ -59,7 +61,7 @@
762 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
763 LIB_SASL = @LIB_SASL@
764 LIB_WRAP = @LIB_WRAP@
765-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
766+DEPLIBS = ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
767 UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
768
769 LDAP_LIBS=@LDAP_LIBS@
770@@ -88,33 +90,33 @@
771 all: $(PROGS)
772
773 install:
774- $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
775- $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
776- $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
777+ $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
778+ $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
779+ $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
780
781 .c.o:
782 $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
783
784 ptloader: ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(DEPLIBS)
785- $(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)
786+ $(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)
787
788 ptloader.pure: ptloader.o @WITH_PTS@.o ../imap/mutex_fake.o $(DEPLIBS)
789- $(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)
790+ $(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)
791
792 ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
793- $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
794+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
795
796 ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
797- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
798+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
799
800 ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
801- $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
802+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
803
804 ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
805- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
806+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
807
808 ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
809- $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
810+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
811
812 clean:
813 rm -f *.o Makefile.bak $(PROGS) makedepend.log
814--- cyrus-imapd-2.2.3/sieve/sieved.c.orig 2003-10-22 18:03:25.000000000 +0000
815+++ cyrus-imapd-2.2.3/sieve/sieved.c 2004-03-14 15:54:34.000000000 +0000
816@@ -48,6 +48,9 @@
817 /* from bc_eval.c */
818 int unwrap_string(bytecode_input_t *bc, int pos, const char **str, int *len);
819
820+/* config.c stuff */
821+const int config_need_data = 0;
822+
823 /*this is called by xmalloc*/
824 void fatal(const char *s, int code)
825 {
826--- cyrus-imapd-2.2.3/imtest/imtest.c.orig 2004-01-03 15:14:29.000000000 +0000
827+++ cyrus-imapd-2.2.3/imtest/imtest.c 2004-03-14 16:20:47.000000000 +0000
828@@ -268,6 +268,9 @@
829 imtest_fatal(msg);
830 }
831
832+/* config.c stuff */
833+const int config_need_data = 0;
834+
835 int mysasl_config(void *context __attribute__((unused)),
836 const char *plugin_name,
837 const char *option,
838--- cyrus-imapd-2.2.3/perl/imap/IMAP.xs.orig 2003-11-25 21:28:23.000000000 +0000
839+++ cyrus-imapd-2.2.3/perl/imap/IMAP.xs 2004-03-14 17:13:48.000000000 +0000
840@@ -74,6 +74,7 @@
841 {
842 croak(s);
843 }
844+const int config_need_data = 0;
845
846 /*
847 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
848--- cyrus-imapd-2.2.3/perl/sieve/managesieve/managesieve.xs.orig 2003-10-22 18:50:27.000000000 +0000
849+++ cyrus-imapd-2.2.3/perl/sieve/managesieve/managesieve.xs 2004-03-14 17:12:50.000000000 +0000
850@@ -96,6 +96,7 @@
851 croak("failure: %s", s);
852 exit(-1);
853 }
854+const int config_need_data = 0;
855
856 static int
857 perlsieve_getpass(conn, context, id, psecret)
High-performance mail store with IMAP and POP3
This page took 0.129023 seconds and 4 git commands to generate.