-diff -Nur libxml2-2.6.17.orig/Makefile.am libxml2-2.6.17/Makefile.am
---- libxml2-2.6.17.orig/Makefile.am 2005-01-11 10:17:08.000000000 +0100
-+++ libxml2-2.6.17/Makefile.am 2005-01-18 12:10:48.763861240 +0100
-@@ -4,7 +4,7 @@
-
- DIST_SUBDIRS = include . doc example python xstc
-
--INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
-+INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
-
- noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
- testThreads testC14N testAutomata testRegexp \
-@@ -16,7 +16,7 @@
- bin_SCRIPTS=xml2-config
-
- lib_LTLIBRARIES = libxml2.la
--libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-+libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
-
- if USE_VERSION_SCRIPT
- LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
-@@ -24,10 +24,10 @@
- LIBXML2_VERSION_SCRIPT =
- endif
-
--libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \
-+libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \
- $(LIBXML2_VERSION_SCRIPT) \
-- -version-info @LIBXML_VERSION_INFO@ \
-- @MODULE_PLATFORM_LIBS@
-+ -version-info $(LIBXML_VERSION_INFO) \
-+ $(MODULE_PLATFORM_LIBS)
-
- if WITH_TRIO_SOURCES
- libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
-@@ -41,7 +41,7 @@
- endif
-
- DEPS = $(top_builddir)/libxml2.la
--LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
-+LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
-
-
- man_MANS = xml2-config.1 libxml.3
-@@ -52,7 +52,7 @@
- xmllint_SOURCES=xmllint.c
- xmllint_LDFLAGS =
- xmllint_DEPENDENCIES = $(DEPS)
--xmllint_LDADD= @RDL_LIBS@ $(LDADDS)
-+xmllint_LDADD= $(RDL_LIBS) libxml2.la
-
- testSAX_SOURCES=testSAX.c
- testSAX_LDFLAGS =
-@@ -1031,8 +1031,6 @@
-
- CLEANFILES=xml2Conf.sh
-
--confexecdir=$(libdir)
--confexec_DATA = xml2Conf.sh
- CVS_EXTRA_DIST=
- EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
- libxml.m4 Copyright check-xml-test-suite.py gentest.py \