diff --git a/ChangeLog b/ChangeLog index 7e610853d27c0bc4a89782a1217f1651933678ef_Q2hhbmdlTG9n..4a67d223fc6197524bf638cbb0e5b4ba6ede5718_Q2hhbmdlTG9n 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 4 24:18:12 HKT 2004 William Brack <wbrack@mmm.com.hk> + + * 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 <wbrack@mmm.com.hk> * libexslt/Makefile.am: implemented change from Joel Reed for diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index 7e610853d27c0bc4a89782a1217f1651933678ef_eHNsdHByb2MvTWFrZWZpbGUuYW0=..4a67d223fc6197524bf638cbb0e5b4ba6ede5718_eHNsdHByb2MvTWFrZWZpbGUuYW0= 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -10,7 +10,6 @@ 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 @@ $(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)