]> 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
- up to 2.4.13
[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
bc54fdab 154@@ -181,177 +181,177 @@
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 $@ $? \
768ab77b
ER		 349+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
350 $(LIBS)
351
352 sync_client: sync_client.lo sync_support.lo \
353 backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
354- $(CC) $(LDFLAGS) -o $@ $? \
355+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
356 $(LIBS)
357
358 sync_reset: sync_reset.lo sync_support.lo \
359 libimap.la mutex_fake.lo $(DEPLIBS)
360- $(CC) $(LDFLAGS) -o $@ $? \
361+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
362 $(LIBS)
be79fb78
ER		 363
364 ### Other Misc Targets
32bec8aa 365
d18be73f 366 clean:
768ab77b 367- rm -f *.lo *.la Makefile.bak makedepend.log \
72f213ad 368+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak makedepend.log \
768ab77b 369 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS) cyr_virusscan
0010a797
ER		 370
371 distclean: clean
768ab77b
ER		 372--- cyrus-imapd-2.4.4/imtest/imtest.c 2010-11-30 07:53:22.205286646 +0200
373+++ cyrus-imapd-2.4.4-shared-patch//imtest/imtest.c 2010-11-29 08:14:14.318040263 +0200
374@@ -283,6 +283,9 @@
375 imtest_fatal(msg);
376 }
32bec8aa 377
768ab77b
ER		 378+/* config.c stuff */
379+const int config_need_data = 0;
380+
381 int mysasl_config(void *context __attribute__((unused)),
382 const char *plugin_name,
383 const char *option,
384--- cyrus-imapd-2.4.4/imtest/Makefile.in 2010-11-30 07:53:22.205286646 +0200
385+++ cyrus-imapd-2.4.4-shared-patch//imtest/Makefile.in 2010-11-29 08:56:17.502937602 +0200
386@@ -45,11 +45,12 @@
387
388 srcdir = @srcdir@
389 top_srcdir = @top_srcdir@
32bec8aa 390+top_builddir = @top_builddir@
768ab77b 391 VPATH = @srcdir@
32bec8aa 392
768ab77b 393 CC = @CC@
3beb582f 394 INSTALL = @INSTALL@
768ab77b
ER		 395-RANLIB = @RANLIB@
396+LIBTOOL = @LIBTOOL@
3beb582f 397
768ab77b
ER		 398 DEFS = @DEFS@ @LOCALDEFS@
399 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
400@@ -73,7 +74,7 @@
401 all: imtest
d18be73f 402
32bec8aa 403 install:
768ab77b
ER		 404- $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
405+ $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
406 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
407 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
408 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
409@@ -82,19 +83,19 @@
410 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
411 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
32bec8aa 412
768ab77b
ER		 413-.c.lo:
414- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
415+%.lo: %.c
416+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
32bec8aa 417
768ab77b
ER		 418 imtest: imtest.lo $(DEPLIBS)
419- $(CC) $(LDFLAGS) -o $@ $? \
420+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
421 $(IMAP_LIBS)
32bec8aa 422
768ab77b
ER		 423 imtest.pure: imtest.lo $(OBJS) $(DEPLIBS)
424- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
425+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
426 $(LIBS) $(IMAP_LIBS)
32bec8aa
JB		 427
428 clean:
768ab77b 429- rm -f *.lo Makefile.bak makedepend.log imtest
72f213ad 430+ rm -rf .libs *.lo *.o Makefile.bak makedepend.log imtest
be79fb78
ER		 431
432 distclean: clean
3beb582f 433 rm -f Makefile
768ab77b
ER		 434--- cyrus-imapd-2.4.4/installsieve/Makefile.in 2010-11-30 07:53:22.205286646 +0200
435+++ cyrus-imapd-2.4.4-shared-patch//installsieve/Makefile.in 2010-11-29 08:23:07.319044464 +0200
436@@ -47,6 +47,8 @@
32bec8aa 437
3beb582f 438 CC = @CC@
cad185d7
AF		 439 RANLIB = @RANLIB@
440+LIBTOOL = @LIBTOOL@
441+top_builddir = @top_builddir@
32bec8aa 442
768ab77b
ER		 443 DEFS = @DEFS@
444 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
445@@ -68,21 +70,19 @@
446 all: installsieve
32bec8aa 447
3beb582f 448 install:
768ab77b
ER		 449- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
450+ $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
cad185d7 451
768ab77b 452 OBJS=lex.lo mystring.lo request.lo isieve.lo
3beb582f 453
768ab77b
ER		 454 libinstallsieve.la: $(OBJS)
455- rm -f libinstallsieve.la
456- ar cr libinstallsieve.la $(OBJS)
457- $(RANLIB) libinstallsieve.la
458+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
3beb582f 459
768ab77b
ER		 460 installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
461- $(CC) $(LDFLAGS) -o $@ $? \
462+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
463 $(IMAP_LIBS)
464
465 clean:
466- rm -f *.lo *.la Makefile.bak makedepend.log
72f213ad 467+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak makedepend.log
768ab77b
ER		 468
469 distclean: clean
470 rm -f Makefile installsieve
471@@ -90,8 +90,8 @@
472 depend:
473 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
474
475-.c.lo:
476- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
477+%.lo: %.c
478+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
479 $<
480
481
482--- cyrus-imapd-2.4.4/lib/Makefile.in 2010-11-30 07:53:22.205286646 +0200
483+++ cyrus-imapd-2.4.4-shared-patch//lib/Makefile.in 2010-11-29 08:53:13.346000595 +0200
484@@ -56,7 +56,8 @@
485 CC = @CC@
3beb582f
AF		 486
487 INSTALL = @INSTALL@
768ab77b 488-RANLIB = @RANLIB@
3beb582f
AF		 489+LIBTOOL = @LIBTOOL@
490+top_builddir = @top_builddir@
491
492 DEFS = @DEFS@ @LOCALDEFS@
493 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
768ab77b 494@@ -110,9 +111,8 @@
cad185d7
AF		 495
496 install:
497 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
768ab77b
ER		 498- $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
499- $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
500- $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.la
5f54d32e 501+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
0b88d0d8 502+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
cad185d7
AF		 503 for file in $(LIBCYR_HDRS); \
504 do \
0010a797 505 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
768ab77b 506@@ -122,19 +122,15 @@
cad185d7
AF		 507 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
508 done
509
768ab77b 510-.c.lo:
cad185d7
AF		 511- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
512+%.lo: %.c
0010a797 513+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
cad185d7
AF		 514 $<
515
768ab77b
ER		 516-libcyrus.la: $(LIBCYR_OBJS)
517- rm -f libcyrus.la
518- ar cr libcyrus.la $(LIBCYR_OBJS)
519- $(RANLIB) libcyrus.la
cad185d7 520+libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
768ab77b
ER		 521+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @LIBS@ @LIB_SASL@ -rpath $(libdir) -release $(VERSION)
522
523 libcyrus_min.la: $(LIBCYRM_OBJS)
524- rm -f libcyrus_min.la
525- ar cr libcyrus_min.la $(LIBCYRM_OBJS)
526- $(RANLIB) libcyrus_min.la
527+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @IMAP_COM_ERR_LIBS@ -rpath $(libdir) -release $(VERSION)
32bec8aa 528
cad185d7 529 imapopts.c: imapoptions $(srcdir)/../tools/config2header
a3bbdeb1 530 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
768ab77b
ER		 531@@ -153,7 +149,7 @@
532 @echo "### Done building chartables."
0010a797
ER		 533
534 clean:
768ab77b 535- rm -f *.lo *.la chartable.c Makefile.bak makedepend.log \
72f213ad 536+ rm -rf .libs *.lo *.o *.la *.a chartable.c Makefile.bak makedepend.log \
0010a797
ER		 537 $(BUILTSOURCES)
538
539 distclean: clean
768ab77b
ER		 540--- cyrus-imapd-2.4.4/makedepend/configure.in 2010-11-30 07:53:22.205286646 +0200
541+++ cyrus-imapd-2.4.4-shared-patch//makedepend/configure.in 2010-11-29 08:14:14.308038617 +0200
542@@ -2,7 +2,7 @@
3beb582f
AF		 543 AC_INIT(cppsetup.c)
544 AC_PROG_CC
545 AC_PROG_INSTALL
546-AC_PROG_RANLIB
547+AC_PROG_LIBTOOL
548 AC_PROG_MAKE_SET
549 AC_CHECK_HEADERS(stdarg.h)
550 AC_SUBST(CPPFLAGS)
768ab77b
ER		 551--- cyrus-imapd-2.4.4/makedepend/Makefile.in 2010-11-30 07:53:22.205286646 +0200
552+++ cyrus-imapd-2.4.4-shared-patch//makedepend/Makefile.in 2010-11-29 08:54:31.942253188 +0200
3beb582f
AF		 553@@ -44,11 +44,13 @@
554 # $Id$
555 #
556 srcdir = @srcdir@
d18be73f 557+top_builddir = @top_builddir@
3beb582f 558 VPATH = @srcdir@
d18be73f 559
d18be73f
ER		 560 CC = @CC@
561 INSTALL = @INSTALL@
562 RANLIB = @RANLIB@
563+LIBTOOL = @LIBTOOL@
d18be73f 564
cad185d7 565 DEFS = @DEFS@
3beb582f 566 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
768ab77b 567@@ -62,15 +64,15 @@
d18be73f 568
3beb582f 569 all: makedepend
d18be73f 570
768ab77b 571-.c.lo:
0010a797
ER		 572- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
573+%.lo: %.c
574+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 575
768ab77b
ER		 576 makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo $(DEPLIBS)
577- $(CC) $(LDFLAGS) -o $@ $? \
578+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
579 $(LIBS)
d18be73f 580
0010a797 581 clean:
768ab77b 582- rm -f *.lo Makefile.bak makedepend
72f213ad 583+ rm -rf .libs *.lo *.o Makefile.bak makedepend
0010a797
ER		 584
585 distclean: clean
586 rm -f Makefile
768ab77b
ER		 587--- cyrus-imapd-2.4.4/master/Makefile.in 2010-11-30 07:53:22.205286646 +0200
588+++ cyrus-imapd-2.4.4-shared-patch//master/Makefile.in 2010-11-29 08:17:23.282457954 +0200
589@@ -48,6 +48,8 @@
d18be73f 590 CC = @CC@
3beb582f 591 INSTALL = @INSTALL@
d18be73f
ER		 592 RANLIB = @RANLIB@
593+LIBTOOL = @LIBTOOL@
594+top_builddir = @top_builddir@
595
768ab77b
ER		 596 CYRUS_USER=@cyrus_user@
597 CYRUS_GROUP=@cyrus_group@
598@@ -78,19 +80,19 @@
599 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
600 for file in $(PROGS); \
601 do \
602- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
603+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
604 done
605
606-.c.lo:
607- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
608+%.lo: %.c
609+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
610 $<
611
612 master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
613- $(CC) $(LDFLAGS) -o $@ $? \
614+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
615 $(LIBS) $(DEPLIBS)
616
617 clean:
618- rm -f *.lo *.la Makefile.bak $(PROGS)
619+ rm -f .libs *.a *.lo *.la Makefile.bak $(PROGS)
620
621 distclean: clean
622 rm -f Makefile
623--- cyrus-imapd-2.4.4/netnews/Makefile.in 2010-11-30 07:53:22.208620530 +0200
624+++ cyrus-imapd-2.4.4-shared-patch//netnews/Makefile.in 2010-11-29 08:37:19.582533564 +0200
625@@ -48,7 +48,8 @@
626
627 CC = @CC@
628 INSTALL = @INSTALL@
629-RANLIB = @RANLIB@
630+LIBTOOL = @LIBTOOL@
631+top_builddir = @top_builddir@
632
633 DEFS = @DEFS@
634 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
635@@ -71,17 +72,17 @@
636 all: remotepurge
e299ecfc 637
0010a797 638 install:
768ab77b
ER		 639- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
640+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
d18be73f 641
768ab77b 642-.c.lo:
3beb582f 643- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 644+%.lo: %.c
3beb582f 645+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 646
768ab77b
ER		 647 remotepurge: $(OBJS) $(DEPLIBS)
648- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
649+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
3beb582f 650
0010a797
ER		 651
652 clean:
768ab77b 653- rm -f *.lo Makefile.bak remotepurge makedepend.log
72f213ad 654+ rm -rf .libs *.lo *.o Makefile.bak remotepurge makedepend.log
0010a797
ER		 655
656 distclean: clean
657 rm -f Makefile
768ab77b
ER		 658--- cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-30 07:53:22.208620530 +0200
659+++ cyrus-imapd-2.4.4-shared-patch//notifyd/Makefile.in 2010-11-29 08:20:28.862982985 +0200
660@@ -49,6 +49,8 @@
661
662 CC = @CC@
663 RANLIB = @RANLIB@
664+LIBTOOL = @LIBTOOL@
665+top_builddir = @top_builddir@
666
667 INSTALL = @INSTALL@
668 CYRUS_USER=@cyrus_user@
669@@ -82,26 +84,26 @@
670 all: notifyd
671
672 install:
673- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
674+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
675
676 OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo \
677 notify_external.lo
678
679 notifytest: notifytest.lo
680- $(CC) $(LDFLAGS) -o $@ $? \
681+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
682 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
683
684 notifyd: $(OBJS) $(SERVICE)
685- $(CC) $(LDFLAGS) -o $@ $? \
686+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
687 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
688
689 notifyd.pure: $(OBJS) $(SERVICE)
690 $(PURIFY) $(PUREOPT) \
691- $(CC) $(LDFLAGS) -o $@ $? \
692+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
693 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
694
695 clean:
696- rm -f notifyd notifytest *.lo *.la *~ Makefile.bak makedepend.log
72f213ad 697+ rm -rf notifyd notifytest .libs *.lo *.o *.la *.a *~ Makefile.bak makedepend.log
768ab77b
ER		 698
699 distclean: clean
700 rm -f Makefile
701@@ -109,8 +111,8 @@
702 depend:
703 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
704
705-.c.lo:
706- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
707+%.lo: %.c
708+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
709 $<
710
711 # DO NOT DELETE THIS LINE -- make depend depends on it.
712--- cyrus-imapd-2.4.4/perl/imap/IMAP.xs 2010-11-30 07:53:22.211954414 +0200
713+++ cyrus-imapd-2.4.4-shared-patch//perl/imap/IMAP.xs 2010-11-29 08:14:14.301370855 +0200
714@@ -76,6 +76,7 @@
715 {
716 croak(s);
3beb582f 717 }
768ab77b 718+const int config_need_data = 0;
0010a797 719
768ab77b
ER		 720 /*
721 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
768ab77b
ER		 722--- cyrus-imapd-2.4.4/perl/sieve/lib/Makefile.in 2010-11-30 07:53:22.211954414 +0200
723+++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/lib/Makefile.in 2010-11-29 08:44:40.675056075 +0200
724@@ -49,7 +49,8 @@
725
726 CC = @CC@
727 INSTALL = @INSTALL@
728-RANLIB = @RANLIB@
729+LIBTOOL = @LIBTOOL@
730+top_builddir = @top_builddir@
731
732 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
733 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
734@@ -74,16 +75,14 @@
735
736 install:
737
738-.c.lo:
739- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
740+%.lo: %.c
741+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
742
743 libisieve.la: $(OBJS)
744- rm -f libisieve.la
745- ar cr libisieve.la $(OBJS)
746- $(RANLIB) libisieve.la
747+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
748
749 clean:
750- rm -f *.lo Makefile.bak makedepend.log libisieve.la
72f213ad 751+ rm -rf .libs *.la *.lo *.o Makefile.bak makedepend.log
768ab77b
ER		 752
753 distclean: clean
754 rm -f Makefile
768ab77b
ER		 755--- cyrus-imapd-2.4.4/perl/sieve/managesieve/managesieve.xs 2010-11-30 07:53:22.211954414 +0200
756+++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/managesieve/managesieve.xs 2010-11-29 08:14:14.304704736 +0200
757@@ -72,6 +72,7 @@
758 croak("failure: %s", s);
759 exit(-1);
760 }
3beb582f 761+const int config_need_data = 0;
768ab77b
ER		 762
763 static int
764 perlsieve_getpass(conn, context, id, psecret)
765--- cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-30 07:53:22.211954414 +0200
766+++ cyrus-imapd-2.4.4-shared-patch//ptclient/Makefile.in 2010-11-29 08:58:33.885354117 +0200
767@@ -50,7 +50,8 @@
768
0010a797
ER		 769 CC = @CC@
770 INSTALL = @INSTALL@
768ab77b 771-RANLIB = @RANLIB@
0010a797 772+LIBTOOL = @LIBTOOL@
3beb582f 773+top_builddir = @top_builddir@
0010a797
ER		 774
775 DEFS = @DEFS@
3beb582f 776 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
768ab77b 777@@ -89,36 +90,36 @@
3beb582f
AF		 778 all: $(PROGS)
779
780 install:
781- $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
782- $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
783- $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
784+ $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
785+ $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
786+ $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
0010a797 787
768ab77b 788-.c.lo:
3beb582f 789- $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 790+%.lo: %.c
3beb582f 791+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 792
768ab77b
ER		 793 ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
794- $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
795+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
796
797 ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
798- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
799+ $(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)
800
801 ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
802- $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
803+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
804
805 ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
806- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
807+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
808
809 ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
810- $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
811+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
812
813 ptdump.pure: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
814- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
815+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
816
817 ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
818- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
819+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
0010a797
ER		 820
821 clean:
768ab77b 822- rm -f *.lo Makefile.bak $(PROGS) makedepend.log
72f213ad 823+ rm -rf .libs *.lo *.o Makefile.bak $(PROGS) makedepend.log
0010a797
ER		 824
825 distclean: clean
826 rm -f Makefile
768ab77b
ER		 827--- cyrus-imapd-2.4.4/sieve/Makefile.in 2010-11-30 07:53:22.215288298 +0200
828+++ cyrus-imapd-2.4.4-shared-patch//sieve/Makefile.in 2010-11-29 09:06:25.952918572 +0200
829@@ -44,6 +44,7 @@
0010a797
ER		 830
831 srcdir = @srcdir@
768ab77b 832 top_srcdir = @top_srcdir@
0010a797
ER		 833+top_builddir = @top_builddir@
834 VPATH = @srcdir@
835
768ab77b
ER		 836 prefix = @prefix@
837@@ -51,10 +52,11 @@
838 service_path = @service_path@
839
0010a797 840 CC = @CC@
768ab77b
ER		 841+INSTALL = @INSTALL@
842 YACC = @YACC@
843 YFLAGS = -d
844 LEX = @LEX@
845-RANLIB = @RANLIB@
0010a797 846+LIBTOOL = @LIBTOOL@
768ab77b 847 COMPILE_ET = @COMPILE_ET@
0010a797 848
768ab77b
ER		 849 DEFS = @DEFS@ @LOCALDEFS@
850@@ -85,7 +87,7 @@
851 $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
0010a797 852
768ab77b
ER		 853 test: libsieve.la test.lo ../imap/message.lo $(DEPLIBS)
854- $(CC) $(LDFLAGS) -o $@ $? \
855+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
856 $(LIBS)
0010a797 857
768ab77b
ER		 858 OBJS = sieve_err.lo \
859@@ -119,15 +121,13 @@
860 #libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
861 #changed to...
862 libsieve.la: $(OBJS)
863- rm -f libsieve.la
864- ar cr libsieve.la $(OBJS)
865- $(RANLIB) libsieve.la
866+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
0010a797 867
768ab77b
ER		 868 sievec: sievec.lo libsieve.la $(DEPLIBS)
869- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
870+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
0010a797 871
768ab77b
ER		 872 sieved: sieved.lo libsieve.la $(DEPLIBS)
873- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
65d305ed 874+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ sieved.lo libsieve.la $(LIBS) $(DEPLIBS)
0010a797 875
0010a797 876
768ab77b
ER		 877 sieve_interface.h: sieve_err.h
878@@ -136,7 +136,7 @@
879 $(COMPILE_ET) $(srcdir)/sieve_err.et
0010a797
ER		 880
881 clean:
768ab77b 882- rm -f sievec sieved test *~ *.lo *.la Makefile.bak makedepend.log
72f213ad 883+ rm -rf .libs sievec sieved test *~ *.lo *.o *.la *.a Makefile.bak makedepend.log
0010a797
ER		 884
885 distclean: clean
768ab77b
ER		 886 rm -f sieve_err.c sieve_err.h
887@@ -148,7 +148,8 @@
888 depend:
889 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
0010a797 890
768ab77b
ER		 891-.c.lo:
892+%.lo: %.c
893+ $(LIBTOOL) --mode=compile --tag=CC \
894 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
895 $<
0010a797 896
768ab77b
ER		 897--- cyrus-imapd-2.4.4/syslog/Makefile.in 2010-11-30 07:53:22.215288298 +0200
898+++ cyrus-imapd-2.4.4-shared-patch//syslog/Makefile.in 2010-11-29 08:25:14.816679541 +0200
899@@ -44,12 +44,14 @@
0010a797
ER		 900 # $Id$
901
902 srcdir = @srcdir@
903+top_builddir = @top_builddir@
904 VPATH = @srcdir@
905
906 CC = @CC@
768ab77b 907
0010a797
ER		 908 INSTALL = @INSTALL@
909 RANLIB = @RANLIB@
910+LIBTOOL = @LIBTOOL@
911
912 DEFS = @DEFS@
768ab77b
ER		 913 CPPFLAGS = @CPPFLAGS@
914@@ -66,18 +68,17 @@
915 install:
916 @echo "Install syslogd and syslog.conf as appropriate"
0010a797 917
768ab77b
ER		 918-.c.lo:
919- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
0010a797 920+%.lo: %.c
768ab77b
ER		 921+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
922
923 libsyslog.la: syslog.lo
924- ar cr libsyslog.la syslog.lo
925- $(RANLIB) libsyslog.la
926+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $<
927
928 syslogd: syslogd.lo
929- $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
930+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
0010a797 931
3beb582f 932 clean:
768ab77b 933- rm -f *.lo *.la Makefile.bak
72f213ad 934+ rm -rf .libs *.lo *.o *.la *.a Makefile.bak
0010a797 935
3beb582f
AF		 936 distclean: clean
937 rm -f Makefile
768ab77b
ER		 938--- cyrus-imapd-2.4.4/timsieved/Makefile.in 2010-11-30 07:53:22.215288298 +0200
939+++ cyrus-imapd-2.4.4-shared-patch//timsieved/Makefile.in 2010-11-29 08:40:02.882717314 +0200
940@@ -48,7 +48,8 @@
941 VPATH = @srcdir@
3beb582f
AF		 942
943 CC = @CC@
768ab77b 944-RANLIB = @RANLIB@
3beb582f
AF		 945+LIBTOOL = @LIBTOOL@
946+top_builddir = @top_builddir@
3beb582f 947
768ab77b
ER		 948 INSTALL = @INSTALL@
949 CYRUS_USER=@cyrus_user@
950@@ -82,22 +83,22 @@
951 all: timsieved
3beb582f 952
768ab77b
ER		 953 install:
954- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
955+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
3beb582f 956
768ab77b
ER		 957 OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
958 ../imap/proxy.lo
3beb582f 959
768ab77b
ER		 960 timsieved: $(OBJS) $(SERVICE)
961- $(CC) $(LDFLAGS) -o $@ \
962+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
963 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
3beb582f 964
768ab77b
ER		 965 timsieved.pure: $(OBJS) $(SERVICE)
966 $(PURIFY) $(PUREOPT) \
967- $(CC) $(LDFLAGS) -o $@ \
968+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
969 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
0010a797
ER		 970
971 clean:
768ab77b 972- rm -f timsieved *~ *.lo *.la Makefile.bak makedepend.log
72f213ad 973+ rm -rf timsieved .libs *~ *.lo *.o *.la *.a Makefile.bak makedepend.log
0010a797
ER		 974
975 distclean: clean
768ab77b
ER		 976 rm -f Makefile
977@@ -105,8 +106,8 @@
3beb582f 978 depend:
768ab77b 979 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
3beb582f 980
768ab77b 981-.c.lo:
3beb582f
AF		 982- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
983+%.lo: %.c
984+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
985 $<
986
987 # DO NOT DELETE THIS LINE -- make depend depends on it.
79bc6b48
AM		 988--- cyrus-imapd-2.4.10/configure.in~ 2011-07-30 22:17:55.000000000 +0200
989+++ cyrus-imapd-2.4.10/configure.in 2011-07-30 22:21:57.705797231 +0200
990@@ -1078,7 +1078,7 @@
991 ;;
992 *) # use whatever they told us, or whatever we found
993 COMPILE_ET="${with_com_err}/bin/compile_et"
994- COM_ERR_LDFLAGS="-L${with_com_err}/lib"
995+ COM_ERR_LDFLAGS=""
996 COM_ERR_LIBS="-lcom_err"
997 COM_ERR_CPPFLAGS="-I${with_com_err}/include"
998 # Ever get the feeling people hide this stuff on purpose?
3f09f123
AF		 999--- cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL.wiget 2011-07-04 17:05:01.000000000 +0200
1000+++ cyrus-imapd-2.4.10/perl/sieve/managesieve/Makefile.PL 2011-07-31 19:33:33.426399853 +0200
1001@@ -61,8 +61,8 @@ WriteMakefile(
1002 'NAME' => 'Cyrus::SIEVE::managesieve',
1003 'ABSTRACT' => 'Cyurs Sieve management interface',
1004 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
1005- 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
1006- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
1007+ 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o',
1008+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
1009 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
1010 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
1011 );
1012--- cyrus-imapd-2.4.10/perl/imap/Makefile.PL.wiget 2011-07-04 17:05:01.000000000 +0200
1013+++ cyrus-imapd-2.4.10/perl/imap/Makefile.PL 2011-07-31 20:20:12.772972475 +0200
1014@@ -73,8 +73,8 @@ WriteMakefile(
1015 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
1016 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
1017 'OBJECT' => 'IMAP.o',
1018- 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
1019- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
1020+ 'MYEXTLIB' => '',
1021+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
1022 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
1023 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
1024 'EXE_FILES' => [cyradm],
High-performance mail store with IMAP and POP3
This page took 0.27806 seconds and 4 git commands to generate.