]> 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
- move lots of admin-only/system-only stuff to sbin and lib, yet keep compat
[packages/cyrus-imapd.git] / cyrus-imapd-shared.patch
CommitLineData
768ab77b
ER		 1--- cyrus-imapd-2.4.4/com_err/et/Makefile.in 2010-11-30 07:53:22.181949458 +0200
2+++ cyrus-imapd-2.4.4-shared-patch//com_err/et/Makefile.in 2010-11-29 09:02:12.537952808 +0200
3@@ -44,11 +44,12 @@
4 # $Id$
0010a797 5
768ab77b 6 srcdir = @srcdir@
3beb582f 7+top_builddir = @top_builddir@
768ab77b 8 VPATH = @srcdir@
cad185d7 9
768ab77b 10 CC = @CC@
3beb582f 11 INSTALL = @INSTALL@
768ab77b
ER		 12-RANLIB = @RANLIB@
13+LIBTOOL = @LIBTOOL@
14 ARCHIVE = ar cr
3beb582f 15
768ab77b
ER		 16 AWK = @AWK@
17@@ -71,8 +72,8 @@
3beb582f
AF		 18
19 install:
3beb582f 20
768ab77b
ER		 21-.c.lo:
22- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
23+%.lo: %.c
24+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
3beb582f 25
768ab77b
ER		 26 # solaris make loses on com_err.c but not on init_et.c, but this helps
27 com_err.lo: com_err.c
28@@ -92,14 +93,9 @@
29 $(CP) $(srcdir)/et_h.lawk et_h.lawk
3beb582f
AF		 30
31 clean:
768ab77b
ER		 32- rm -f compile_et compile_et.lo error_table.lo
33- rm -f libcom_err.la
34- rm -f $(LIBOBJS)
72f213ad 35+ rm -rf .libs *.la *.lo *.o compile_et $(LIBOBJS)
3beb582f
AF		 36
37 distclean: clean
768ab77b
ER		 38- rm -f compile_et compile_et.lo error_table.lo
39- rm -f libcom_err.la
40- rm -f $(LIBOBJS)
41 rm Makefile
3beb582f 42
768ab77b
ER		 43 depend: compile_et
44@@ -120,20 +116,14 @@
45 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
3beb582f 46
768ab77b
ER		 47 libcom_err.la: $(LIBOBJS)
48- rm -f libcom_err.la
49- $(ARCHIVE) $@ $(LIBOBJS)
50- $(RANLIB) $@
51+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LIBOBJS)
3beb582f 52
768ab77b
ER		 53 #install::
54-# $(INSTALLLIB) libcom_err.la $(DESTDIR)$(LIBDIR)/libcom_err.la
55-# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.la
56-# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.la
57-# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.la
58+# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
59 ##
3beb582f 60
768ab77b
ER		 61 libcom_err.lo: $(LIBOBJS)
62- ld -r -s -o $@ $? \
63- chmod -x libcom_err.lo
64+ $(LIBTOOL) --mode=link --tag=CC ld -r -s -o $@ $?
3beb582f 65
768ab77b
ER		 66 TAGS: et_name.c error_message.c compile_et.c error_table.c \
67 lex.yy.c init_et.c
68--- cyrus-imapd-2.4.4/configure.in 2010-11-30 07:53:22.188617226 +0200
69+++ cyrus-imapd-2.4.4-shared-patch//configure.in 2010-11-30 07:56:42.315002988 +0200
70@@ -87,7 +87,7 @@
71 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
3beb582f 72
768ab77b
ER		 73 AC_PROG_CC
74-AC_PROG_RANLIB
75+AC_PROG_LIBTOOL
76 AC_PROG_MAKE_SET
77 AC_PROG_INSTALL
78 AC_AIX
79--- cyrus-imapd-2.4.4/depot/Makefile.in 2010-11-30 07:53:22.195284994 +0200
80+++ cyrus-imapd-2.4.4-shared-patch//depot/Makefile.in 2010-11-29 09:03:17.505292828 +0200
81@@ -44,11 +44,12 @@
0010a797
ER		 82 # $Id$
83
84 srcdir = @srcdir@
85+top_builddir = @top_builddir@
86 VPATH = @srcdir@
87
88 CC = @CC@
89 INSTALL = @INSTALL@
768ab77b 90-RANLIB = @RANLIB@
0010a797
ER		 91+LIBTOOL = @LIBTOOL@
92
d18be73f 93 DEFS = @DEFS@
768ab77b
ER		 94 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
95@@ -73,11 +74,11 @@
96 $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
97 $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
0010a797 98
768ab77b
ER		 99-.c.lo:
100- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 101+%.lo: %.c
768ab77b 102+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797
ER		 103
104 clean:
768ab77b 105- rm -f *.lo Makefile.bak makedepend.log
72f213ad 106+ rm -rf .libs *.lo *.o Makefile.bak makedepend.log
0010a797
ER		 107
108 distclean: clean
109 rm -f Makefile
768ab77b
ER		 110--- cyrus-imapd-2.4.4/imap/Makefile.in 2010-11-30 07:53:22.195284994 +0200
111+++ cyrus-imapd-2.4.4-shared-patch//imap/Makefile.in 2010-11-29 08:33:40.489840319 +0200
112@@ -48,12 +48,14 @@
be79fb78
ER		 113
114 srcdir = @srcdir@
115 top_srcdir = @top_srcdir@
116+top_builddir = @top_builddir@
117 VPATH = @srcdir@
118
119 CC = @CC@
120 INSTALL = @INSTALL@
121 RANLIB = @RANLIB@
122 AWK = @AWK@
123+LIBTOOL = @LIBTOOL@
124
125 CYRUS_USER=@cyrus_user@
126 CYRUS_GROUP=@cyrus_group@
768ab77b 127@@ -133,22 +135,20 @@
e299ecfc 128 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
768ab77b
ER		 129 for file in $(PROGS); \
130 do \
e299ecfc 131- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
e299ecfc
ER		 132+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
133 done
134 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
be79fb78
ER		 135 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
136 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
137
768ab77b 138-.c.lo:
be79fb78
ER		 139- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
140+%.lo: %.c
0010a797 141+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
be79fb78
ER		 142 $<
143
144 ### libimap
145
768ab77b
ER		 146 libimap.la: $(LOBJS)
147- rm -f libimap.la
148- ar cr libimap.la $(LOBJS)
149- $(RANLIB) libimap.la
150+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LOBJS)
be79fb78
ER		 151
152 ### Built Source Files
153
768ab77b 154@@ -181,185 +181,185 @@
32bec8aa
JB		 155
156 ### Services
768ab77b
ER		 157 idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
158- $(CC) $(LDFLAGS) -o $@ $? \
159+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
160 $(LIBS)
161
162 lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
163 libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
164- $(CC) $(LDFLAGS) -o $@ $? \
165+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
166 $(LIBS) $(LIB_WRAP)
167
168 lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
169 mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
170- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
171+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
172 $(LIBS) $(LIB_WRAP)
173
174 imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
175- $(CC) $(LDFLAGS) -o $@ $? \
176+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
177 $(LIBS) $(LIB_WRAP)
178
179 imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
180- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
181+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
182 $(LIBS) $(LIB_WRAP)
183
184 imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
185- $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o $@ $? \
186+ $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
187 $(LIBS) $(LIB_WRAP)
188
189 mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
190 libimap.la $(DEPLIBS)
191- $(CC) $(LDFLAGS) -o $@ $? \
192+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
193 $(SERVICETHREAD) \
194 $(LIBS) $(LIB_WRAP) -lpthread
195
196 mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
197 libimap.la $(DEPLIBS)
198- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
199+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
200 $(SERVICETHREAD) \
201 $(LIBS) $(LIB_WRAP) -lpthread
202
203 pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
cad185d7 204 $(DEPLIBS) $(SERVICE)
768ab77b
ER		 205- $(CC) $(LDFLAGS) -o $@ $? \
206+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
207 $(LIBS) $(LIB_WRAP)
208
209 nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
210 mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
211- $(CC) $(LDFLAGS) -o $@ $? \
212+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
213 $(LIBS) $(LIB_WRAP)
214
215 fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
216- $(CC) $(LDFLAGS) -o $@ $? \
217+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
218 $(LIBS) $(LIB_WRAP)
219
220 smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
221- $(CC) $(LDFLAGS) -o $@ $? \
222+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
223 $(LIBS) $(LIB_WRAP)
224
225 sync_server: sync_server.lo sync_support.lo \
226 imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
227- $(CC) $(LDFLAGS) -o $@ $? \
228+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
229 $(LIBS) $(LIB_WRAP)
cad185d7 230
32bec8aa 231 ### Command Line Utilities
768ab77b
ER		 232 arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
233- $(CC) $(LDFLAGS) -o $@ $? \
234+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
235 $(LIBS)
236
237 cyr_userseen: cyr_userseen.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
238- $(CC) $(LDFLAGS) -o $@ $? \
239+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
240 $(LIBS)
241
242 cyr_sequence: cyr_sequence.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
243- $(CC) $(LDFLAGS) -o $@ $? \
244+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
245 $(LIBS)
246
247 cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
248- $(CC) $(LDFLAGS) -o $@ $? \
249+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
250 $(LIBS)
251
252 cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
253- $(CC) $(LDFLAGS) -o $@ $? \
254+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
255 $(LIBS)
256
257 cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
258- $(CC) $(LDFLAGS) -o $@ $? \
259+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
260 $(LIBS)
261
262 chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
263- $(CC) $(LDFLAGS) -o $@ $? \
264+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
265 $(LIBS)
266
267 deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
268- $(CC) $(LDFLAGS) -o $@ $? \
269+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
270 $(LIBS)
271
272 ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
273- $(CC) $(LDFLAGS) -o $@ $? \
274+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
275 $(LIBS)
276
277 ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
278- $(CC) $(LDFLAGS) -o $@ $? \
279+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
280 $(LIBS)
281
282 ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
283- $(CC) $(LDFLAGS) -o $@ $? \
284+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
285 $(LIBS)
286
287 cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
288- $(CC) $(LDFLAGS) -o $@ $? \
289+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
290 $(LIBS)
291
292 fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
293- $(CC) $(LDFLAGS) -o $@ $? \
294+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
295 $(LIBS)
296
297 squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
298- $(CC) $(LDFLAGS) -o $@ $? \
299+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
300 $(LIBS)
301
302 mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
303- $(CC) $(LDFLAGS) -o $@ $? \
304+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
305 $(LIBS)
306
307 ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
308- $(CC) $(LDFLAGS) -o $@ $? \
309+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
310 $(LIBS)
311
312 cyr_virusscan: cyr_virusscan.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
313- $(CC) $(LDFLAGS) -o $@ $? \
314+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
315 $(LIBS) -lclamav
316
317 cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
318- $(CC) $(LDFLAGS) -o $@ $? \
319+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
320 $(LIBS)
321
322 cyr_df: cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS)
323- $(CC) $(LDFLAGS) -o $@ $? \
324+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
325 $(LIBS)
326
327 mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
328- $(CC) $(LDFLAGS) -o $@ $? \
329+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
330 $(LIBS)
331
332 reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
333- $(CC) $(LDFLAGS) -o $@ $? \
334+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
335 $(LIBS)
336
337 quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
338- $(CC) $(LDFLAGS) -o $@ $? \
339+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
340 $(LIBS)
341
342 tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
343- $(CC) $(LDFLAGS) -o $@ $? \
344+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
345 $(LIBS)
346
347 unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
348- $(CC) $(LDFLAGS) -o $@ $? \
349+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
350 $(LIBS)
351
352 make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
353- $(CC) $(LDFLAGS) -o $@ $? \
354+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
355 $(LIBS)
356
357 make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
358- $(CC) $(LDFLAGS) -o $@ $? \
359+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
360 $(LIBS)
361
362 sync_client: sync_client.lo sync_support.lo \
363 backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
364- $(CC) $(LDFLAGS) -o $@ $? \
365+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
366 $(LIBS)
367
368 sync_reset: sync_reset.lo sync_support.lo \
369 libimap.la mutex_fake.lo $(DEPLIBS)
370- $(CC) $(LDFLAGS) -o $@ $? \
371+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
372 $(LIBS)
be79fb78
ER		 373
374 ### Other Misc Targets
32bec8aa 375
d18be73f 376 clean:
768ab77b 377- rm -f *.lo *.la Makefile.bak makedepend.log \
72f213ad 378+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak makedepend.log \
768ab77b 379 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS) cyr_virusscan
0010a797
ER		 380
381 distclean: clean
768ab77b
ER		 382--- cyrus-imapd-2.4.4/imtest/imtest.c 2010-11-30 07:53:22.205286646 +0200
383+++ cyrus-imapd-2.4.4-shared-patch//imtest/imtest.c 2010-11-29 08:14:14.318040263 +0200
384@@ -283,6 +283,9 @@
385 imtest_fatal(msg);
386 }
32bec8aa 387
768ab77b
ER		 388+/* config.c stuff */
389+const int config_need_data = 0;
390+
391 int mysasl_config(void *context __attribute__((unused)),
392 const char *plugin_name,
393 const char *option,
394--- cyrus-imapd-2.4.4/imtest/Makefile.in 2010-11-30 07:53:22.205286646 +0200
395+++ cyrus-imapd-2.4.4-shared-patch//imtest/Makefile.in 2010-11-29 08:56:17.502937602 +0200
396@@ -45,11 +45,12 @@
397
398 srcdir = @srcdir@
399 top_srcdir = @top_srcdir@
32bec8aa 400+top_builddir = @top_builddir@
768ab77b 401 VPATH = @srcdir@
32bec8aa 402
768ab77b 403 CC = @CC@
3beb582f 404 INSTALL = @INSTALL@
768ab77b
ER		 405-RANLIB = @RANLIB@
406+LIBTOOL = @LIBTOOL@
3beb582f 407
768ab77b
ER		 408 DEFS = @DEFS@ @LOCALDEFS@
409 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
410@@ -73,7 +74,7 @@
411 all: imtest
d18be73f 412
32bec8aa 413 install:
768ab77b
ER		 414- $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
415+ $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
416 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
417 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
418 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
419@@ -82,19 +83,19 @@
420 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
421 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
32bec8aa 422
768ab77b
ER		 423-.c.lo:
424- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
425+%.lo: %.c
426+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
32bec8aa 427
768ab77b
ER		 428 imtest: imtest.lo $(DEPLIBS)
429- $(CC) $(LDFLAGS) -o $@ $? \
430+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
431 $(IMAP_LIBS)
32bec8aa 432
768ab77b
ER		 433 imtest.pure: imtest.lo $(OBJS) $(DEPLIBS)
434- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
435+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
436 $(LIBS) $(IMAP_LIBS)
32bec8aa
JB		 437
438 clean:
768ab77b 439- rm -f *.lo Makefile.bak makedepend.log imtest
72f213ad 440+ rm -rf .libs *.lo *.o Makefile.bak makedepend.log imtest
be79fb78
ER		 441
442 distclean: clean
3beb582f 443 rm -f Makefile
768ab77b
ER		 444--- cyrus-imapd-2.4.4/installsieve/Makefile.in 2010-11-30 07:53:22.205286646 +0200
445+++ cyrus-imapd-2.4.4-shared-patch//installsieve/Makefile.in 2010-11-29 08:23:07.319044464 +0200
446@@ -47,6 +47,8 @@
32bec8aa 447
3beb582f 448 CC = @CC@
cad185d7
AF		 449 RANLIB = @RANLIB@
450+LIBTOOL = @LIBTOOL@
451+top_builddir = @top_builddir@
32bec8aa 452
768ab77b
ER		 453 DEFS = @DEFS@
454 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
455@@ -68,21 +70,19 @@
456 all: installsieve
32bec8aa 457
3beb582f 458 install:
768ab77b
ER		 459- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
460+ $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
cad185d7 461
768ab77b 462 OBJS=lex.lo mystring.lo request.lo isieve.lo
3beb582f 463
768ab77b
ER		 464 libinstallsieve.la: $(OBJS)
465- rm -f libinstallsieve.la
466- ar cr libinstallsieve.la $(OBJS)
467- $(RANLIB) libinstallsieve.la
468+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
3beb582f 469
768ab77b
ER		 470 installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
471- $(CC) $(LDFLAGS) -o $@ $? \
472+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
473 $(IMAP_LIBS)
474
475 clean:
476- rm -f *.lo *.la Makefile.bak makedepend.log
72f213ad 477+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak makedepend.log
768ab77b
ER		 478
479 distclean: clean
480 rm -f Makefile installsieve
481@@ -90,8 +90,8 @@
482 depend:
483 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
484
485-.c.lo:
486- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
487+%.lo: %.c
488+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
489 $<
490
491
492--- cyrus-imapd-2.4.4/lib/Makefile.in 2010-11-30 07:53:22.205286646 +0200
493+++ cyrus-imapd-2.4.4-shared-patch//lib/Makefile.in 2010-11-29 08:53:13.346000595 +0200
494@@ -56,7 +56,8 @@
495 CC = @CC@
3beb582f
AF		 496
497 INSTALL = @INSTALL@
768ab77b 498-RANLIB = @RANLIB@
3beb582f
AF		 499+LIBTOOL = @LIBTOOL@
500+top_builddir = @top_builddir@
501
502 DEFS = @DEFS@ @LOCALDEFS@
503 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
768ab77b 504@@ -110,9 +111,8 @@
cad185d7
AF		 505
506 install:
507 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
768ab77b
ER		 508- $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
509- $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
510- $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.la
5f54d32e 511+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
0b88d0d8 512+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
cad185d7
AF		 513 for file in $(LIBCYR_HDRS); \
514 do \
0010a797 515 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
768ab77b 516@@ -122,19 +122,15 @@
cad185d7
AF		 517 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
518 done
519
768ab77b 520-.c.lo:
cad185d7
AF		 521- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
522+%.lo: %.c
0010a797 523+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
cad185d7
AF		 524 $<
525
768ab77b
ER		 526-libcyrus.la: $(LIBCYR_OBJS)
527- rm -f libcyrus.la
528- ar cr libcyrus.la $(LIBCYR_OBJS)
529- $(RANLIB) libcyrus.la
cad185d7 530+libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
768ab77b
ER		 531+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @LIBS@ @LIB_SASL@ -rpath $(libdir) -release $(VERSION)
532
533 libcyrus_min.la: $(LIBCYRM_OBJS)
534- rm -f libcyrus_min.la
535- ar cr libcyrus_min.la $(LIBCYRM_OBJS)
536- $(RANLIB) libcyrus_min.la
537+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @IMAP_COM_ERR_LIBS@ -rpath $(libdir) -release $(VERSION)
32bec8aa 538
cad185d7 539 imapopts.c: imapoptions $(srcdir)/../tools/config2header
a3bbdeb1 540 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
768ab77b
ER		 541@@ -153,7 +149,7 @@
542 @echo "### Done building chartables."
0010a797
ER		 543
544 clean:
768ab77b 545- rm -f *.lo *.la chartable.c Makefile.bak makedepend.log \
72f213ad 546+ rm -rf .libs *.lo *.o *.la *.a chartable.c Makefile.bak makedepend.log \
0010a797
ER		 547 $(BUILTSOURCES)
548
549 distclean: clean
768ab77b
ER		 550--- cyrus-imapd-2.4.4/makedepend/configure.in 2010-11-30 07:53:22.205286646 +0200
551+++ cyrus-imapd-2.4.4-shared-patch//makedepend/configure.in 2010-11-29 08:14:14.308038617 +0200
552@@ -2,7 +2,7 @@
3beb582f
AF		 553 AC_INIT(cppsetup.c)
554 AC_PROG_CC
555 AC_PROG_INSTALL
556-AC_PROG_RANLIB
557+AC_PROG_LIBTOOL
558 AC_PROG_MAKE_SET
559 AC_CHECK_HEADERS(stdarg.h)
560 AC_SUBST(CPPFLAGS)
768ab77b
ER		 561--- cyrus-imapd-2.4.4/makedepend/Makefile.in 2010-11-30 07:53:22.205286646 +0200
562+++ cyrus-imapd-2.4.4-shared-patch//makedepend/Makefile.in 2010-11-29 08:54:31.942253188 +0200
3beb582f
AF		 563@@ -44,11 +44,13 @@
564 # $Id$
565 #
566 srcdir = @srcdir@
d18be73f 567+top_builddir = @top_builddir@
3beb582f 568 VPATH = @srcdir@
d18be73f 569
d18be73f
ER		 570 CC = @CC@
571 INSTALL = @INSTALL@
572 RANLIB = @RANLIB@
573+LIBTOOL = @LIBTOOL@
d18be73f 574
cad185d7 575 DEFS = @DEFS@
3beb582f 576 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
768ab77b 577@@ -62,15 +64,15 @@
d18be73f 578
3beb582f 579 all: makedepend
d18be73f 580
768ab77b 581-.c.lo:
0010a797
ER		 582- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
583+%.lo: %.c
584+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 585
768ab77b
ER		 586 makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo $(DEPLIBS)
587- $(CC) $(LDFLAGS) -o $@ $? \
588+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
589 $(LIBS)
d18be73f 590
0010a797 591 clean:
768ab77b 592- rm -f *.lo Makefile.bak makedepend
72f213ad 593+ rm -rf .libs *.lo *.o Makefile.bak makedepend
0010a797
ER		 594
595 distclean: clean
596 rm -f Makefile
768ab77b
ER		 597--- cyrus-imapd-2.4.4/master/Makefile.in 2010-11-30 07:53:22.205286646 +0200
598+++ cyrus-imapd-2.4.4-shared-patch//master/Makefile.in 2010-11-29 08:17:23.282457954 +0200
599@@ -48,6 +48,8 @@
d18be73f 600 CC = @CC@
3beb582f 601 INSTALL = @INSTALL@
d18be73f
ER		 602 RANLIB = @RANLIB@
603+LIBTOOL = @LIBTOOL@
604+top_builddir = @top_builddir@
605
768ab77b
ER		 606 CYRUS_USER=@cyrus_user@
607 CYRUS_GROUP=@cyrus_group@
608@@ -78,19 +80,19 @@
609 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
610 for file in $(PROGS); \
611 do \
612- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
613+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
614 done
615
616-.c.lo:
617- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
618+%.lo: %.c
619+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
620 $<
621
622 master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
623- $(CC) $(LDFLAGS) -o $@ $? \
624+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
625 $(LIBS) $(DEPLIBS)
626
627 clean:
628- rm -f *.lo *.la Makefile.bak $(PROGS)
629+ rm -f .libs *.a *.lo *.la Makefile.bak $(PROGS)
630
631 distclean: clean
632 rm -f Makefile
633--- cyrus-imapd-2.4.4/netnews/Makefile.in 2010-11-30 07:53:22.208620530 +0200
634+++ cyrus-imapd-2.4.4-shared-patch//netnews/Makefile.in 2010-11-29 08:37:19.582533564 +0200
635@@ -48,7 +48,8 @@
636
637 CC = @CC@
638 INSTALL = @INSTALL@
639-RANLIB = @RANLIB@
640+LIBTOOL = @LIBTOOL@
641+top_builddir = @top_builddir@
642
643 DEFS = @DEFS@
644 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
645@@ -71,17 +72,17 @@
646 all: remotepurge
e299ecfc 647
0010a797 648 install:
768ab77b
ER		 649- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
650+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
d18be73f 651
768ab77b 652-.c.lo:
3beb582f 653- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 654+%.lo: %.c
3beb582f 655+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 656
768ab77b
ER		 657 remotepurge: $(OBJS) $(DEPLIBS)
658- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
659+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
3beb582f 660
0010a797
ER		 661
662 clean:
768ab77b 663- rm -f *.lo Makefile.bak remotepurge makedepend.log
72f213ad 664+ rm -rf .libs *.lo *.o Makefile.bak remotepurge makedepend.log
0010a797
ER		 665
666 distclean: clean
667 rm -f Makefile
768ab77b
ER		 668--- cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-30 07:53:22.208620530 +0200
669+++ cyrus-imapd-2.4.4-shared-patch//notifyd/Makefile.in 2010-11-29 08:20:28.862982985 +0200
670@@ -49,6 +49,8 @@
671
672 CC = @CC@
673 RANLIB = @RANLIB@
674+LIBTOOL = @LIBTOOL@
675+top_builddir = @top_builddir@
676
677 INSTALL = @INSTALL@
678 CYRUS_USER=@cyrus_user@
679@@ -82,26 +84,26 @@
680 all: notifyd
681
682 install:
683- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
684+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
685
686 OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo \
687 notify_external.lo
688
689 notifytest: notifytest.lo
690- $(CC) $(LDFLAGS) -o $@ $? \
691+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
692 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
693
694 notifyd: $(OBJS) $(SERVICE)
695- $(CC) $(LDFLAGS) -o $@ $? \
696+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
697 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
698
699 notifyd.pure: $(OBJS) $(SERVICE)
700 $(PURIFY) $(PUREOPT) \
701- $(CC) $(LDFLAGS) -o $@ $? \
702+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
703 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
704
705 clean:
706- rm -f notifyd notifytest *.lo *.la *~ Makefile.bak makedepend.log
72f213ad 707+ rm -rf notifyd notifytest .libs *.lo *.o *.la *.a *~ Makefile.bak makedepend.log
768ab77b
ER		 708
709 distclean: clean
710 rm -f Makefile
711@@ -109,8 +111,8 @@
712 depend:
713 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
714
715-.c.lo:
716- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
717+%.lo: %.c
718+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
719 $<
720
721 # DO NOT DELETE THIS LINE -- make depend depends on it.
722--- cyrus-imapd-2.4.4/perl/imap/IMAP.xs 2010-11-30 07:53:22.211954414 +0200
723+++ cyrus-imapd-2.4.4-shared-patch//perl/imap/IMAP.xs 2010-11-29 08:14:14.301370855 +0200
724@@ -76,6 +76,7 @@
725 {
726 croak(s);
3beb582f 727 }
768ab77b 728+const int config_need_data = 0;
0010a797 729
768ab77b
ER		 730 /*
731 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
768ab77b
ER		 732--- cyrus-imapd-2.4.4/perl/sieve/lib/Makefile.in 2010-11-30 07:53:22.211954414 +0200
733+++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/lib/Makefile.in 2010-11-29 08:44:40.675056075 +0200
734@@ -49,7 +49,8 @@
735
736 CC = @CC@
737 INSTALL = @INSTALL@
738-RANLIB = @RANLIB@
739+LIBTOOL = @LIBTOOL@
740+top_builddir = @top_builddir@
741
742 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
743 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
744@@ -74,16 +75,14 @@
745
746 install:
747
748-.c.lo:
749- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
750+%.lo: %.c
751+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
752
753 libisieve.la: $(OBJS)
754- rm -f libisieve.la
755- ar cr libisieve.la $(OBJS)
756- $(RANLIB) libisieve.la
757+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
758
759 clean:
760- rm -f *.lo Makefile.bak makedepend.log libisieve.la
72f213ad 761+ rm -rf .libs *.la *.lo *.o Makefile.bak makedepend.log
768ab77b
ER		 762
763 distclean: clean
764 rm -f Makefile
768ab77b
ER		 765--- cyrus-imapd-2.4.4/perl/sieve/managesieve/managesieve.xs 2010-11-30 07:53:22.211954414 +0200
766+++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/managesieve/managesieve.xs 2010-11-29 08:14:14.304704736 +0200
767@@ -72,6 +72,7 @@
768 croak("failure: %s", s);
769 exit(-1);
770 }
3beb582f 771+const int config_need_data = 0;
768ab77b
ER		 772
773 static int
774 perlsieve_getpass(conn, context, id, psecret)
775--- cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-30 07:53:22.211954414 +0200
776+++ cyrus-imapd-2.4.4-shared-patch//ptclient/Makefile.in 2010-11-29 08:58:33.885354117 +0200
777@@ -50,7 +50,8 @@
778
0010a797
ER		 779 CC = @CC@
780 INSTALL = @INSTALL@
768ab77b 781-RANLIB = @RANLIB@
0010a797 782+LIBTOOL = @LIBTOOL@
3beb582f 783+top_builddir = @top_builddir@
0010a797
ER		 784
785 DEFS = @DEFS@
3beb582f 786 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
768ab77b 787@@ -89,36 +90,36 @@
3beb582f
AF		 788 all: $(PROGS)
789
790 install:
791- $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
792- $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
793- $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
794+ $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
795+ $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
796+ $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
0010a797 797
768ab77b 798-.c.lo:
3beb582f 799- $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 800+%.lo: %.c
3beb582f 801+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 802
768ab77b
ER		 803 ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
804- $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
805+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
806
807 ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
808- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
809+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
810
811 ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
812- $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
813+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
814
815 ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
816- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
817+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
818
819 ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
820- $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
821+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
822
823 ptdump.pure: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
824- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
825+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
826
827 ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
828- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
829+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
0010a797
ER		 830
831 clean:
768ab77b 832- rm -f *.lo Makefile.bak $(PROGS) makedepend.log
72f213ad 833+ rm -rf .libs *.lo *.o Makefile.bak $(PROGS) makedepend.log
0010a797
ER		 834
835 distclean: clean
836 rm -f Makefile
768ab77b
ER		 837--- cyrus-imapd-2.4.4/sieve/Makefile.in 2010-11-30 07:53:22.215288298 +0200
838+++ cyrus-imapd-2.4.4-shared-patch//sieve/Makefile.in 2010-11-29 09:06:25.952918572 +0200
839@@ -44,6 +44,7 @@
0010a797
ER		 840
841 srcdir = @srcdir@
768ab77b 842 top_srcdir = @top_srcdir@
0010a797
ER		 843+top_builddir = @top_builddir@
844 VPATH = @srcdir@
845
768ab77b
ER		 846 prefix = @prefix@
847@@ -51,10 +52,11 @@
848 service_path = @service_path@
849
0010a797 850 CC = @CC@
768ab77b
ER		 851+INSTALL = @INSTALL@
852 YACC = @YACC@
853 YFLAGS = -d
854 LEX = @LEX@
855-RANLIB = @RANLIB@
0010a797 856+LIBTOOL = @LIBTOOL@
768ab77b 857 COMPILE_ET = @COMPILE_ET@
0010a797 858
768ab77b
ER		 859 DEFS = @DEFS@ @LOCALDEFS@
860@@ -85,7 +87,7 @@
861 $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
0010a797 862
768ab77b
ER		 863 test: libsieve.la test.lo ../imap/message.lo $(DEPLIBS)
864- $(CC) $(LDFLAGS) -o $@ $? \
865+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
866 $(LIBS)
0010a797 867
768ab77b
ER		 868 OBJS = sieve_err.lo \
869@@ -119,15 +121,13 @@
870 #libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
871 #changed to...
872 libsieve.la: $(OBJS)
873- rm -f libsieve.la
874- ar cr libsieve.la $(OBJS)
875- $(RANLIB) libsieve.la
876+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
0010a797 877
768ab77b
ER		 878 sievec: sievec.lo libsieve.la $(DEPLIBS)
879- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
880+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
0010a797 881
768ab77b
ER		 882 sieved: sieved.lo libsieve.la $(DEPLIBS)
883- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
65d305ed 884+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ sieved.lo libsieve.la $(LIBS) $(DEPLIBS)
0010a797 885
0010a797 886
768ab77b
ER		 887 sieve_interface.h: sieve_err.h
888@@ -136,7 +136,7 @@
889 $(COMPILE_ET) $(srcdir)/sieve_err.et
0010a797
ER		 890
891 clean:
768ab77b 892- rm -f sievec sieved test *~ *.lo *.la Makefile.bak makedepend.log
72f213ad 893+ rm -rf .libs sievec sieved test *~ *.lo *.o *.la *.a Makefile.bak makedepend.log
0010a797
ER		 894
895 distclean: clean
768ab77b
ER		 896 rm -f sieve_err.c sieve_err.h
897@@ -148,7 +148,8 @@
898 depend:
899 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
0010a797 900
768ab77b
ER		 901-.c.lo:
902+%.lo: %.c
903+ $(LIBTOOL) --mode=compile --tag=CC \
904 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
905 $<
0010a797 906
768ab77b
ER		 907--- cyrus-imapd-2.4.4/syslog/Makefile.in 2010-11-30 07:53:22.215288298 +0200
908+++ cyrus-imapd-2.4.4-shared-patch//syslog/Makefile.in 2010-11-29 08:25:14.816679541 +0200
909@@ -44,12 +44,14 @@
0010a797
ER		 910 # $Id$
911
912 srcdir = @srcdir@
913+top_builddir = @top_builddir@
914 VPATH = @srcdir@
915
916 CC = @CC@
768ab77b 917
0010a797
ER		 918 INSTALL = @INSTALL@
919 RANLIB = @RANLIB@
920+LIBTOOL = @LIBTOOL@
921
922 DEFS = @DEFS@
768ab77b
ER		 923 CPPFLAGS = @CPPFLAGS@
924@@ -66,18 +68,17 @@
925 install:
926 @echo "Install syslogd and syslog.conf as appropriate"
0010a797 927
768ab77b
ER		 928-.c.lo:
929- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
0010a797 930+%.lo: %.c
768ab77b
ER		 931+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
932
933 libsyslog.la: syslog.lo
934- ar cr libsyslog.la syslog.lo
935- $(RANLIB) libsyslog.la
936+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $<
937
938 syslogd: syslogd.lo
939- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
940+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
0010a797 941
3beb582f 942 clean:
768ab77b 943- rm -f *.lo *.la Makefile.bak
72f213ad 944+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak
0010a797 945
3beb582f
AF		 946 distclean: clean
947 rm -f Makefile
768ab77b
ER		 948--- cyrus-imapd-2.4.4/timsieved/Makefile.in 2010-11-30 07:53:22.215288298 +0200
949+++ cyrus-imapd-2.4.4-shared-patch//timsieved/Makefile.in 2010-11-29 08:40:02.882717314 +0200
950@@ -48,7 +48,8 @@
951 VPATH = @srcdir@
3beb582f
AF		 952
953 CC = @CC@
768ab77b 954-RANLIB = @RANLIB@
3beb582f
AF		 955+LIBTOOL = @LIBTOOL@
956+top_builddir = @top_builddir@
3beb582f 957
768ab77b
ER		 958 INSTALL = @INSTALL@
959 CYRUS_USER=@cyrus_user@
960@@ -82,22 +83,22 @@
961 all: timsieved
3beb582f 962
768ab77b
ER		 963 install:
964- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
965+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
3beb582f 966
768ab77b
ER		 967 OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
968 ../imap/proxy.lo
3beb582f 969
768ab77b
ER		 970 timsieved: $(OBJS) $(SERVICE)
971- $(CC) $(LDFLAGS) -o $@ \
972+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
973 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
3beb582f 974
768ab77b
ER		 975 timsieved.pure: $(OBJS) $(SERVICE)
976 $(PURIFY) $(PUREOPT) \
977- $(CC) $(LDFLAGS) -o $@ \
978+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
979 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
0010a797
ER		 980
981 clean:
768ab77b 982- rm -f timsieved *~ *.lo *.la Makefile.bak makedepend.log
72f213ad 983+ rm -rf timsieved .libs *~ *.lo *.o *.la *.a Makefile.bak makedepend.log
0010a797
ER		 984
985 distclean: clean
768ab77b
ER		 986 rm -f Makefile
987@@ -105,8 +106,8 @@
3beb582f 988 depend:
768ab77b 989 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
3beb582f 990
768ab77b 991-.c.lo:
3beb582f
AF		 992- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
993+%.lo: %.c
994+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
995 $<
996
997 # DO NOT DELETE THIS LINE -- make depend depends on it.
79bc6b48
AM		 998--- cyrus-imapd-2.4.10/configure.in~ 2011-07-30 22:17:55.000000000 +0200
999+++ cyrus-imapd-2.4.10/configure.in 2011-07-30 22:21:57.705797231 +0200
1000@@ -1078,7 +1078,7 @@
1001 ;;
1002 *) # use whatever they told us, or whatever we found
1003 COMPILE_ET="${with_com_err}/bin/compile_et"
1004- COM_ERR_LDFLAGS="-L${with_com_err}/lib"
1005+ COM_ERR_LDFLAGS=""
1006 COM_ERR_LIBS="-lcom_err"
1007 COM_ERR_CPPFLAGS="-I${with_com_err}/include"
1008 # Ever get the feeling people hide this stuff on purpose?
3f09f123
AF		 1009--- cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL.wiget 2011-07-04 17:05:01.000000000 +0200
1010+++ cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL 2011-07-31 19:33:33.426399853 +0200
1011@@ -61,8 +61,8 @@ WriteMakefile(
1012 'NAME' => 'Cyrus::SIEVE::managesieve',
1013 'ABSTRACT' => 'Cyurs Sieve management interface',
1014 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
1015- 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
1016- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
1017+ 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o',
1018+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
1019 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
1020 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
1021 );
1022--- cyrus-imapd-2.4.10/perl/imap/Makefile.PL.wiget 2011-07-04 17:05:01.000000000 +0200
1023+++ cyrus-imapd-2.4.10/perl/imap/Makefile.PL 2011-07-31 20:20:12.772972475 +0200
1024@@ -73,8 +73,8 @@ WriteMakefile(
1025 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
1026 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
1027 'OBJECT' => 'IMAP.o',
1028- 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
1029- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
1030+ 'MYEXTLIB' => '',
1031+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
1032 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
1033 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
1034 'EXE_FILES' => [cyradm],
High-performance mail store with IMAP and POP3
This page took 0.288167 seconds and 4 git commands to generate.