[packages/cyrus-sasl.git] / cyrus-sasl-automake_1_10.patch

diff -dur -x '*~' cyrus-sasl-2.1.22.orig/plugins/Makefile.am cyrus-sasl-2.1.22/plugins/Makefile.am
--- cyrus-sasl-2.1.22.orig/plugins/Makefile.am	2006-11-08 11:43:22.000000000 +0000
+++ cyrus-sasl-2.1.22/plugins/Makefile.am	2006-11-08 11:46:10.000000000 +0000
@@ -82,83 +82,83 @@
 	libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libldapdb.la
 
 libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
-libplain_la_LDFLAGS = -version-info $(plain_version)
+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
 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 = $(AM_LDFLAGS) -version-info $(anonymous_version)
 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 = $(AM_LDFLAGS) -version-info $(kerberos4_version)
 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 = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
 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 = $(AM_LDFLAGS) -version-info $(crammd5_version)
 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 = $(AM_LDFLAGS) -version-info $(digestmd5_version)
 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 = $(AM_LDFLAGS) -version-info $(login_version)
 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 = $(AM_LDFLAGS) -version-info $(srp_version)
 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 = $(AM_LDFLAGS) -version-info $(otp_version)
 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 = $(AM_LDFLAGS) -version-info $(ntlm_version)
 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 = $(AM_LDFLAGS) -version-info $(passdss_version)
 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 = $(AM_LDFLAGS) -version-info $(sasldb_version)
 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 = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
 libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
 libldapdb_la_LIBADD = $(COMPAT_OBJS)
 
 libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
-libmysql_la_LDFLAGS = $(LIB_MYSQL)  -version-info $(sql_version)
+libmysql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL)  -version-info $(sql_version)
 libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
 libmysql_la_LIBADD = $(COMPAT_OBJS)
 
 libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
-libpgsql_la_LDFLAGS = $(LIB_PGSQL) -version-info $(sql_version)
+libpgsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_PGSQL) -version-info $(sql_version)
 libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
 libpgsql_la_LIBADD = $(COMPAT_OBJS)
 
 libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
-libsqlite_la_LDFLAGS = $(LIB_SQLITE) -version-info $(sql_version)
+libsqlite_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_SQLITE) -version-info $(sql_version)
 libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
 libsqlite_la_LIBADD = $(COMPAT_OBJS)
Commit	Line	Data
e39cd4c5 JK	1	diff -dur -x '*~' cyrus-sasl-2.1.22.orig/plugins/Makefile.am cyrus-sasl-2.1.22/plugins/Makefile.am
	2	--- cyrus-sasl-2.1.22.orig/plugins/Makefile.am 2006-11-08 11:43:22.000000000 +0000
	3	+++ cyrus-sasl-2.1.22/plugins/Makefile.am 2006-11-08 11:46:10.000000000 +0000
	4	@@ -82,83 +82,83 @@
	5	libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libldapdb.la
	6
	7	libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
	8	-libplain_la_LDFLAGS = -version-info $(plain_version)
	9	+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
	10	libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
	11	libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
	12
	13	libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
	14	-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
	15	+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
	16	libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
	17	libanonymous_la_LIBADD = $(COMPAT_OBJS)
	18
	19	libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
	20	-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
	21	+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
	22	libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
	23	libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
	24
	25	libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
	26	-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
	27	+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
	28	libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
	29	libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
	30
	31	libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
	32	-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
	33	+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
	34	libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
	35	libcrammd5_la_LIBADD = $(COMPAT_OBJS)
	36
	37	libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
	38	-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
	39	+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
	40	libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
	41	libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
	42
	43	liblogin_la_SOURCES = login.c login_init.c $(common_sources)
	44	-liblogin_la_LDFLAGS = -version-info $(login_version)
	45	+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
	46	liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
	47	liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
	48
	49	libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
	50	-libsrp_la_LDFLAGS = -version-info $(srp_version)
	51	+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
	52	libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
	53	libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
	54
	55	libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
	56	-libotp_la_LDFLAGS = -version-info $(otp_version)
	57	+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
	58	libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
	59	libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
	60
	61	libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
	62	-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
	63	+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
	64	libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
65	libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
66
67	libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
68	-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
69	+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
70	libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
71	libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
72
73	# Auxprop Plugins
74	libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
75	-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
76	+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
77	libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
78	libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
79
80	libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
81	-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
82	+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
83	libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
84	libldapdb_la_LIBADD = $(COMPAT_OBJS)
85
86	libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
87	-libmysql_la_LDFLAGS = $(LIB_MYSQL) -version-info $(sql_version)
88	+libmysql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) -version-info $(sql_version)
89	libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
90	libmysql_la_LIBADD = $(COMPAT_OBJS)
91
92	libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
93	-libpgsql_la_LDFLAGS = $(LIB_PGSQL) -version-info $(sql_version)
94	+libpgsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_PGSQL) -version-info $(sql_version)
95	libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
96	libpgsql_la_LIBADD = $(COMPAT_OBJS)
97
98	libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
99	-libsqlite_la_LDFLAGS = $(LIB_SQLITE) -version-info $(sql_version)
100	+libsqlite_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_SQLITE) -version-info $(sql_version)
101	libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
102	libsqlite_la_LIBADD = $(COMPAT_OBJS)
103