From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Wed, 8 Nov 2006 11:55:47 +0000 (+0000)
Subject: - automake 1.10 compatibility patch for cyrus-sasl
X-Git-Tag: auto/ac/cyrus-sasl-2_1_22-6~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=e39cd4c58ea847d510f787f8095f3d8a9fa0f8c2;hp=ebcd282081444c9515c7b71650fe2a5c288918ea;p=packages%2Fcyrus-sasl.git

- automake 1.10 compatibility patch for cyrus-sasl

Changed files:
    cyrus-sasl-automake_1_10.patch -> 1.1
---

diff --git a/cyrus-sasl-automake_1_10.patch b/cyrus-sasl-automake_1_10.patch
new file mode 100644
index 0000000..e7e0407
--- /dev/null
+++ b/cyrus-sasl-automake_1_10.patch
@@ -0,0 +1,103 @@
+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)
+