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