This repository has been archived by the owner on Dec 10, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathauto+static.patch
448 lines (406 loc) · 17.4 KB
/
auto+static.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
Index: utils/Makefile.am
===================================================================
RCS file: /cvs/misc/cyrus-sasl/utils/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- utils/Makefile.am 20 Jul 2008 20:44:42 -0000 1.1.1.2
+++ utils/Makefile.am 18 Jan 2009 16:58:42 -0000
@@ -42,8 +42,7 @@
#
################################################################
-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
-all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+all_sasl_libs = ../lib/.libs/libsasl2.a $(SASL_MECHS_LIBS) $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
EXTRA_PROGRAMS = saslpasswd2 sasldblistusers2 testsuite testsuitestatic smtptest pluginviewer
@@ -69,7 +68,7 @@
CLEANFILES=$(EXTRA_PROGRAMS)
testsuitestatic_SOURCES = testsuite.c
-testsuitestatic_LDADD = $(all_sasl_static_libs) @DMALLOC_LIBS@ @SASL_DL_LIB@
+testsuitestatic_LDADD = $(all_sasl_libs) @DMALLOC_LIBS@ @SASL_DL_LIB@
testsuitestatic_DEPENDENCIES = ../lib/.libs/libsasl2.a
smtptest_SOURCES =
Index: saslauthd/configure.in
===================================================================
RCS file: /cvs/misc/cyrus-sasl/saslauthd/configure.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 configure.in
--- saslauthd/configure.in 20 Jul 2008 20:44:48 -0000 1.1.1.2
+++ saslauthd/configure.in 18 Jan 2009 16:58:42 -0000
@@ -77,7 +77,7 @@
AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
SASL_DB_PATH_CHECK()
SASL_DB_CHECK()
- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
+ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
fi
AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ],
Index: saslauthd/Makefile.am
===================================================================
RCS file: /cvs/misc/cyrus-sasl/saslauthd/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- saslauthd/Makefile.am 20 Jul 2008 20:44:47 -0000 1.1.1.2
+++ saslauthd/Makefile.am 18 Jan 2009 16:58:42 -0000
@@ -1,4 +1,5 @@
AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config
sbin_PROGRAMS = saslauthd testsaslauthd
EXTRA_PROGRAMS = saslcache
Index: plugins/Makefile.am
===================================================================
RCS file: /cvs/misc/cyrus-sasl/plugins/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- plugins/Makefile.am 20 Jul 2008 20:44:41 -0000 1.1.1.2
+++ plugins/Makefile.am 18 Jan 2009 16:58:42 -0000
@@ -62,6 +62,12 @@
srp_version = 2:22:0
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+
+# Note: when per-library '_LDFLAGS' variables are defined then
+# AM_LDFLAGS has no effect on the per-library '_LINK' setting so
+# $(AM_LDFLAGS) must be included in every lib*_la_LDFLAGS setting as
+# well!
+#
AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
@@ -82,73 +88,73 @@
libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
-libplain_la_LDFLAGS = -version-info $(plain_version)
+libplain_la_LDFLAGS = -version-info $(plain_version) $(AM_LDFLAGS)
libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
+libanonymous_la_LDFLAGS = -version-info $(anonymous_version) $(AM_LDFLAGS)
libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
libanonymous_la_LIBADD = $(COMPAT_OBJS)
libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
+libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) $(AM_LDFLAGS)
libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
+libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) $(AM_LDFLAGS)
libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
+libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) $(AM_LDFLAGS)
libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
libcrammd5_la_LIBADD = $(COMPAT_OBJS)
libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
+libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) $(AM_LDFLAGS)
libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
liblogin_la_SOURCES = login.c login_init.c $(common_sources)
-liblogin_la_LDFLAGS = -version-info $(login_version)
+liblogin_la_LDFLAGS = -version-info $(login_version) $(AM_LDFLAGS)
liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
-libsrp_la_LDFLAGS = -version-info $(srp_version)
+libsrp_la_LDFLAGS = -version-info $(srp_version) $(AM_LDFLAGS)
libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
-libotp_la_LDFLAGS = -version-info $(otp_version)
+libotp_la_LDFLAGS = -version-info $(otp_version) $(AM_LDFLAGS)
libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
+libntlm_la_LDFLAGS = -version-info $(ntlm_version) $(AM_LDFLAGS)
libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
+libpassdss_la_LDFLAGS = -version-info $(passdss_version) $(AM_LDFLAGS)
libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
# Auxprop Plugins
libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
+libsasldb_la_LDFLAGS = -version-info $(sasldb_version) $(AM_LDFLAGS)
libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
+libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) $(AM_LDFLAGS)
libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
libldapdb_la_LIBADD = $(COMPAT_OBJS)
libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
+libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) $(AM_LDFLAGS)
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
libsql_la_LIBADD = $(COMPAT_OBJS)
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/misc/cyrus-sasl/lib/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- lib/Makefile.am 20 Jul 2008 20:44:41 -0000 1.1.1.2
+++ lib/Makefile.am 18 Jan 2009 17:30:40 -0000
@@ -46,9 +46,6 @@
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
EXTRA_DIST = windlopen.c staticopen.h NTMakefile
-EXTRA_LIBRARIES = libsasl2.a
-noinst_LIBRARIES = @SASL_STATIC_LIBS@
-libsasl2_a_SOURCES=
common_headers = saslint.h
common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c ../plugins/plugin_common.c
@@ -74,10 +71,28 @@
install-exec-hook:
endif
+# we have to update libsasl2.a and libsasl2.la after they have been
+# built so as to include the desired statically compiled plugin module
+# code as well
+#
+all-local: fix-libsasl2-la
+
+# we should probably use the already compiled plugin code .o files
+# instead of recompiling them again (we already depend on the plugin
+# .la files being created)
+#
libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
@echo adding static plugins and dependencies
$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
- @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+ rm -f $@
+ ln -s .libs/$@ $@
+
+# here we accumulate the -L and -l options from all the plugin module
+# libtool .la files and add them to libsasl2.la so libtool will see
+# them on install.
+#
+fix-libsasl2-la: libsasl2.a $(SASL_MECHS_LIBS)
+ @for i in ./libsasl2.la $(SASL_MECHS_LIBS); do \
if test ! -f $$i; then continue; fi; . $$i; \
for j in $$dependency_libs foo; do \
case $$j in foo) ;; \
@@ -90,11 +105,3 @@
esac; done; dependency_libs=""; done; \
sed -e "/^dependency_libs=/s%=.*%='$${depdirs}$${deplibs}'%" \
libsasl2.la >TMP.$$ && mv TMP.$$ libsasl2.la
- rm -f $@
- ln -s .libs/$@ $@
-
-$(SASL_STATIC_OBJS): linksrcs
-
-linksrcs:
- -ln -s $(SASL_STATIC_SRCS) .
-
Index: config/sasldb.m4
===================================================================
RCS file: /cvs/misc/cyrus-sasl/config/sasldb.m4,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 sasldb.m4
--- config/sasldb.m4 20 Jul 2008 20:44:36 -0000 1.1.1.2
+++ config/sasldb.m4 18 Jan 2009 17:31:51 -0000
@@ -96,8 +96,7 @@
AC_MSG_RESULT($dblib)
SASL_DB_BACKEND="db_${dblib}.lo"
-SASL_DB_BACKEND_STATIC="db_${dblib}.o allockey.o"
-SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_${dblib}.c ../sasldb/allockey.c"
+SASL_DB_BACKEND_STATIC="../sasldb/db_${dblib}.o ../sasldb/allockey.o"
SASL_DB_UTILS="saslpasswd2 sasldblistusers2"
SASL_DB_MANS="saslpasswd2.8 sasldblistusers2.8"
@@ -119,8 +118,7 @@
dnl note that we do not add libsasldb.la to SASL_MECHS, since it
dnl will just fail to load anyway.
SASL_DB_BACKEND="db_none.lo"
- SASL_DB_BACKEND_STATIC="db_none.o"
- SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_none.c"
+ SASL_DB_BACKEND_STATIC="../sasldb/db_none.o"
SASL_DB_UTILS=""
SASL_DB_MANS=""
SASL_DB_LIB=""
@@ -129,12 +127,10 @@
if test "$enable_static" = yes; then
if test "$dblib" != "none"; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/sasldb.o $SASL_DB_BACKEND_STATIC"
AC_DEFINE(STATIC_SASLDB,[],[Link SASLdb Staticly])
else
SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
fi
fi
Index: config/plain.m4
===================================================================
RCS file: /cvs/misc/cyrus-sasl/config/plain.m4,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 plain.m4
--- config/plain.m4 20 Jul 2008 20:44:36 -0000 1.1.1.2
+++ config/plain.m4 18 Jan 2009 17:23:55 -0000
@@ -22,8 +22,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libplain.la"
if test "$enable_static" = yes; then
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS plain.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/plain.c"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/plain.o"
AC_DEFINE(STATIC_PLAIN,[],[Link PLAIN Staticly])
fi
else
Index: config/kerberos_v4.m4
===================================================================
RCS file: /cvs/misc/cyrus-sasl/config/kerberos_v4.m4,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 kerberos_v4.m4
--- config/kerberos_v4.m4 20 Jul 2008 20:44:36 -0000 1.1.1.2
+++ config/kerberos_v4.m4 18 Jan 2009 17:23:40 -0000
@@ -140,8 +140,7 @@
if test "$krb4" != no; then
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libkerberos4.la"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/kerberos4.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS kerberos4.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/kerberos4.o"
AC_DEFINE(STATIC_KERBEROS4,[],[User KERBEROS_V4 Staticly])
AC_DEFINE(HAVE_KRB,[],[Do we have Kerberos 4 Support?])
SASL_KRB_LIB="$SASL_KRB_LIB $LIB_DES $COM_ERR"
Index: configure.in
===================================================================
RCS file: /cvs/misc/cyrus-sasl/configure.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 configure.in
--- configure.in 20 Jul 2008 20:44:36 -0000 1.1.1.2
+++ configure.in 18 Jan 2009 17:23:20 -0000
@@ -102,7 +102,7 @@
fi
# new libtool
-AM_DISABLE_STATIC
+#AM_DISABLE_STATIC
AC_PROG_LIBTOOL
target=$save_target
@@ -113,6 +113,8 @@
SASL_STATIC_LIBS=
fi
+# this is stupid and impossible on most sane platforms!
+#
AC_ARG_ENABLE(staticdlopen, [ --enable-staticdlopen try dynamic plugins when we are a static libsasl [[no]] ],
enable_staticdlopen=$enableval,
enable_staticdlopen=no)
@@ -383,8 +385,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libcrammd5.la"
if test "$enable_static" = yes; then
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS cram.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/cram.c"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/cram.o"
AC_DEFINE(STATIC_CRAMMD5, [], [Link CRAM-MD5 Staticly])
fi
else
@@ -418,8 +419,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libdigestmd5.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/digestmd5.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS digestmd5.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/digestmd5.o"
AC_DEFINE(STATIC_DIGESTMD5, [], [Link DIGEST-MD5 Staticly])
fi
else
@@ -443,8 +443,7 @@
SASL_MECHS="$SASL_MECHS libotp.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/otp.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS otp.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/otp.o"
AC_DEFINE(STATIC_OTP, [], [Link OTP Staticly])
fi
@@ -500,8 +499,7 @@
SASL_MECHS="$SASL_MECHS libsrp.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/srp.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS srp.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/srp.o"
AC_DEFINE(STATIC_SRP, [], [Link SRP Staticly])
fi
@@ -556,8 +554,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libanonymous.la"
if test "$enable_static" = yes; then
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS anonymous.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/anonymous.c"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/anonymous.o"
AC_DEFINE(STATIC_ANONYMOUS, [], [Link ANONYMOUS Staticly])
fi
else
@@ -574,8 +571,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS liblogin.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/login.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS login.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/login.o"
AC_DEFINE(STATIC_LOGIN,[],[Link LOGIN Staticly])
fi
else
@@ -600,8 +596,7 @@
SASL_MECHS="$SASL_MECHS libntlm.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/ntlm.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ntlm.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/ntlm.o"
AC_DEFINE(STATIC_NTLM,[],[Link NTLM Staticly])
fi
else
@@ -626,8 +621,7 @@
SASL_MECHS="$SASL_MECHS libpassdss.la"
if test "$enable_static" = yes; then
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS passdss.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/passdss.c"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/passdss.o"
AC_DEFINE(STATIC_PASSDSS,[],[Link PASSDSS Staticly])
fi
else
@@ -657,8 +651,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libsql.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/sql.o"
AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
fi
else
@@ -897,8 +890,7 @@
SASL_MECHS="$SASL_MECHS libldapdb.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/ldapdb.c"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ldapdb.o"
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/ldapdb.o"
AC_DEFINE(STATIC_LDAPDB,[],[Link ldapdb plugin Staticly])
fi
fi
@@ -913,7 +905,11 @@
fi
AC_SUBST(SASL_MECHS)
-AC_SUBST(SASL_STATIC_SRCS)
+SASL_MECHS_LIBS=""
+for lib in ${SASL_MECHS}; do
+ SASL_MECHS_LIBS="$SASL_MECHS_LIBS ../plugins/${lib}"
+done
+AC_SUBST(SASL_MECHS_LIBS)
AC_SUBST(SASL_STATIC_OBJS)
AC_SUBST(SASL_STATIC_LIBS)
Index: Makefile.am
===================================================================
RCS file: /cvs/misc/cyrus-sasl/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- Makefile.am 20 Jul 2008 20:44:35 -0000 1.1.1.2
+++ Makefile.am 18 Jan 2009 16:58:09 -0000
@@ -1,4 +1,5 @@
AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I cmulocal -I config
# Top-level Makefile.am for SASL
# Rob Earhart
#