[xslt] automake 1.4 support and crypto patch



Daniel,

On IRC, Bill and I discussed a warning he saw on a system using automake1.4,
that was caused by the recent crypto patch.

automake1.4 doesn't support AM_LDFLAGS. using AM_LDFLAGS is however, the preferred
approach to use with later automakes (like 1.7 which i tested with).

anyway, if someone uses automake1.4, then tries to link against
libexslt, but doesn't use pkg-config, the link will fail since
AM_LDFLAGS is basically ignored in automake1.4 and libexslt doesn't
get the required "-lgcrypt" stuff. the following patch corrects this
for automake1.4 users (at the expense of the preferred approach to use
with later automake versions.

jr


Index: libexslt/Makefile.am
===================================================================
RCS file: /cvs/gnome/libxslt/libexslt/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- libexslt/Makefile.am	30 Jun 2004 16:43:53 -0000	1.21
+++ libexslt/Makefile.am	4 Jul 2004 02:14:12 -0000
@@ -3,7 +3,6 @@
 	   -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS)
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
-AM_LDFLAGS = $(LIBGCRYPT_LIBS)
 
 lib_LTLIBRARIES = libexslt.la
 
@@ -31,7 +30,7 @@
 
 # The following DOES NOT WORK reliably.
 libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@
+libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
 
 man_MANS = libexslt.3
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]