Attachment 148196 Details for Bug 229010 – cyrus-sasl-2.1.22-automake-1.10.patch

[patch] cyrus-sasl-2.1.22-automake-1.10.patch

cyrus-sasl-2.1.22-automake-1.10.patch (text/plain), 4.54 KB, created by Robert Scheck on 2007-02-16 14:56:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2007-02-16 14:56:26 UTC

Size: 4.54 KB

patch

obsolete

>Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
>originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
>using automake 1.10.
>
>--- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
>+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
>@@ -82,73 +82,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 = $(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)
> 
> 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 = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
> libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
> libsql_la_LIBADD = $(COMPAT_OBJS)
>

Actions: View | Diff

Attachments on bug 229010: 148196