|
@@ -1,125 +0,0 @@
|
1
|
|
---- a/lib/Makefile.am
|
2
|
|
-+++ b/lib/Makefile.am
|
3
|
|
-@@ -44,6 +44,7 @@
|
4
|
|
- sasl_version = 2:23:0
|
5
|
|
-
|
6
|
|
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
|
7
|
|
-+SASL_STATIC_SRC = $(patsubst %.o, %.c, $(SASL_STATIC_OBJS))
|
8
|
|
-
|
9
|
|
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
|
10
|
|
- EXTRA_LIBRARIES = libsasl2.a
|
11
|
|
-@@ -93,7 +94,7 @@ libsasl2.a: libsasl2.la $(SASL_STATIC_OB
|
12
|
|
- rm -f $@
|
13
|
|
- ln -s .libs/$@ $@
|
14
|
|
-
|
15
|
|
--$(SASL_STATIC_OBJS): linksrcs
|
16
|
|
-+$(SASL_STATIC_SRC): linksrcs
|
17
|
|
-
|
18
|
|
- linksrcs:
|
19
|
|
- -ln -s $(SASL_STATIC_SRCS) .
|
20
|
|
---- a/lib/Makefile.in
|
21
|
|
-+++ b/lib/Makefile.in
|
22
|
|
-@@ -176,6 +176,7 @@ SASL_KRB_LIB = @SASL_KRB_LIB@
|
23
|
|
- SASL_MECHS = @SASL_MECHS@
|
24
|
|
- SASL_STATIC_LIBS = @SASL_STATIC_LIBS@
|
25
|
|
- SASL_STATIC_OBJS = @SASL_STATIC_OBJS@
|
26
|
|
-+SASL_STATIC_SRC = $(patsubst %.o, %.c, $(SASL_STATIC_OBJS))
|
27
|
|
- SASL_STATIC_SRCS = @SASL_STATIC_SRCS@
|
28
|
|
- SASL_UTIL_HEADERS_EXTRA = @SASL_UTIL_HEADERS_EXTRA@
|
29
|
|
- SASL_UTIL_LIBS_EXTRA = @SASL_UTIL_LIBS_EXTRA@
|
30
|
|
-@@ -646,7 +647,7 @@ libsasl2.a: libsasl2.la $(SASL_STATIC_OB
|
31
|
|
- rm -f $@
|
32
|
|
- ln -s .libs/$@ $@
|
33
|
|
-
|
34
|
|
--$(SASL_STATIC_OBJS): linksrcs
|
35
|
|
-+$(SASL_STATIC_SRC): linksrcs
|
36
|
|
-
|
37
|
|
- linksrcs:
|
38
|
|
- -ln -s $(SASL_STATIC_SRCS) .
|
39
|
|
---- a/plugins/Makefile.am
|
40
|
|
-+++ b/plugins/Makefile.am
|
41
|
|
-@@ -82,12 +82,12 @@ EXTRA_LTLIBRARIES = libplain.la libanony
|
42
|
|
- libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
|
43
|
|
-
|
44
|
|
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
|
45
|
|
--libplain_la_LDFLAGS = -version-info $(plain_version)
|
46
|
|
-+libplain_la_LDFLAGS = -version-info $(plain_version) $(AM_LDFLAGS)
|
47
|
|
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
|
48
|
|
- libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
|
49
|
|
-
|
50
|
|
- libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
|
51
|
|
--libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
|
52
|
|
-+libanonymous_la_LDFLAGS = -version-info $(anonymous_version) $(AM_LDFLAGS)
|
53
|
|
- libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
|
54
|
|
- libanonymous_la_LIBADD = $(COMPAT_OBJS)
|
55
|
|
-
|
56
|
|
-@@ -97,58 +97,58 @@ libkerberos4_la_DEPENDENCIES = $(COMPAT_
|
57
|
|
- libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
|
58
|
|
-
|
59
|
|
- libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
|
60
|
|
--libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
|
61
|
|
-+libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) $(AM_LDFLAGS)
|
62
|
|
- libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
|
63
|
|
- libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
|
64
|
|
-
|
65
|
|
- libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
|
66
|
|
--libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
|
67
|
|
-+libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) $(AM_LDFLAGS)
|
68
|
|
- libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
|
69
|
|
- libcrammd5_la_LIBADD = $(COMPAT_OBJS)
|
70
|
|
-
|
71
|
|
- libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
|
72
|
|
--libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
|
73
|
|
-+libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) $(AM_LDFLAGS)
|
74
|
|
- libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
|
75
|
|
- libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
|
76
|
|
-
|
77
|
|
- liblogin_la_SOURCES = login.c login_init.c $(common_sources)
|
78
|
|
--liblogin_la_LDFLAGS = -version-info $(login_version)
|
79
|
|
-+liblogin_la_LDFLAGS = -version-info $(login_version) $(AM_LDFLAGS)
|
80
|
|
- liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
|
81
|
|
- liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
|
82
|
|
-
|
83
|
|
- libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
|
84
|
|
--libsrp_la_LDFLAGS = -version-info $(srp_version)
|
85
|
|
-+libsrp_la_LDFLAGS = -version-info $(srp_version) $(AM_LDFLAGS)
|
86
|
|
- libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
|
87
|
|
- libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
|
88
|
|
-
|
89
|
|
- libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
|
90
|
|
--libotp_la_LDFLAGS = -version-info $(otp_version)
|
91
|
|
-+libotp_la_LDFLAGS = -version-info $(otp_version) $(AM_LDFLAGS)
|
92
|
|
- libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
|
93
|
|
- libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
|
94
|
|
-
|
95
|
|
- libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
|
96
|
|
--libntlm_la_LDFLAGS = -version-info $(ntlm_version)
|
97
|
|
-+libntlm_la_LDFLAGS = -version-info $(ntlm_version) $(AM_LDFLAGS)
|
98
|
|
- libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
|
99
|
|
- libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
|
100
|
|
-
|
101
|
|
- libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
|
102
|
|
--libpassdss_la_LDFLAGS = -version-info $(passdss_version)
|
103
|
|
-+libpassdss_la_LDFLAGS = -version-info $(passdss_version) $(AM_LDFLAGS)
|
104
|
|
- libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
|
105
|
|
- libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
|
106
|
|
-
|
107
|
|
- # Auxprop Plugins
|
108
|
|
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
|
109
|
|
--libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
|
110
|
|
-+libsasldb_la_LDFLAGS = -version-info $(sasldb_version) $(AM_LDFLAGS)
|
111
|
|
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
|
112
|
|
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
|
113
|
|
-
|
114
|
|
- libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
|
115
|
|
--libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
|
116
|
|
-+libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) $(AM_LDFLAGS)
|
117
|
|
- libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
|
118
|
|
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
|
119
|
|
-
|
120
|
|
- libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
|
121
|
|
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
|
122
|
|
-+libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) $(AM_LDFLAGS)
|
123
|
|
- libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
|
124
|
|
- libsql_la_LIBADD = $(COMPAT_OBJS)
|
125
|
|
-
|