From f59c49fd3c855590d8731b43364c1cdeaf48b85d Mon Sep 17 00:00:00 2001 From: "William M. Brack" Date: Sun, 4 Jul 2004 15:21:35 +0000 Subject: [PATCH] changed the sequence of LD_ADDS and LIBGCRYPT_LIBS on xsltproc_LDADD. * xsltproc/Makefile.am: changed the sequence of LD_ADDS and LIBGCRYPT_LIBS on xsltproc_LDADD. Previously this was causing the wrong libs to be linked when using the configure option --with-libxml-libs-prefix, or --with-libxml-src (nasty) --- ChangeLog | 7 +++++++ xsltproc/Makefile.am | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d2c4d8a3..88311bf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 4 24:18:12 HKT 2004 William Brack + + * xsltproc/Makefile.am: changed the sequence of LD_ADDS and + LIBGCRYPT_LIBS on xsltproc_LDADD. Previously this was + causing the wrong libs to be linked when using the configure + option --with-libxml-libs-prefix, or --with-libxml-src (nasty) + Sun Jul 4 21:42:48 HKT 2004 William Brack * libexslt/Makefile.am: implemented change from Joel Reed for diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 44210c89..ed78f2c6 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -10,7 +10,6 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) xsltproc_SOURCES = xsltproc.c xsltproc_LDFLAGS = xsltproc_DEPENDENCIES = $(DEPS) -xsltproc_LDADD = $(LDADDS) $(LIBGCRYPT_LIBS) DEPS = $(top_builddir)/libxslt/libxslt.la \ $(top_builddir)/libexslt/libexslt.la @@ -20,6 +19,8 @@ LDADDS = @STATIC_BINARIES@ \ $(top_builddir)/libexslt/libexslt.la \ @LIBXML_LIBS@ $(EXTRA_LIBS) @WIN32_EXTRA_LIBADD@ +xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS) + xsltproc.dv: xsltproc.o $(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt.a ../libxslt/.libs/libxslt.a @LIBXML_LIBS@ $(EXTRA_LIBS)