---- libxml2-2.4.23/Makefile.am.orig Tue Jul 2 04:35:13 2002
-+++ libxml2-2.4.23/Makefile.am Tue Jul 9 23:13:35 2002
-@@ -3,7 +3,7 @@
+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 @@
- SUBDIRS = include . doc example python
+ DIST_SUBDIRS = include . doc example python xstc
--INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@
-+INCLUDES = -I$(srcdir)/include -I$(top_builddir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
+-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 testSAX testHTML testXPath testURI testDocbook \
- testThreads testC14N testAutomata testRegexp
-@@ -13,9 +13,9 @@
+ noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+ testThreads testC14N testAutomata testRegexp \
+@@ -15,9 +15,9 @@
bin_SCRIPTS=xml2-config
lib_LTLIBRARIES = libxml2.la
--libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm
-+libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm
+-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)
--libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
-+libxml2_la_LDFLAGS = -version-info $(LIBXML_VERSION_INFO)
+-libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@ @MODULE_PLATFORM_LIBS@
++libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -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 \
-@@ -35,7 +35,7 @@
+@@ -41,7 +41,7 @@
endif
DEPS = $(top_builddir)/libxml2.la
--LDADDS = $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm
-+LDADDS = $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm
+-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
-@@ -45,7 +45,7 @@
+ man_MANS = xml2-config.1 libxml.3
+@@ -52,7 +52,7 @@
xmllint_SOURCES=xmllint.c
xmllint_LDFLAGS =
xmllint_DEPENDENCIES = $(DEPS)
testSAX_SOURCES=testSAX.c
testSAX_LDFLAGS =
-@@ -689,8 +689,6 @@
+@@ -1031,8 +1031,6 @@
CLEANFILES=xml2Conf.sh
-confexecdir=$(libdir)
-confexec_DATA = xml2Conf.sh
- EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \
- libxml.m4 Copyright check-xml-test-suite.py \
- example/Makefile.am example/gjobread.c example/gjobs.xml \
---- libxml2-2.4.7.orig/include/libxml/Makefile.am Sun Oct 14 04:35:07 2001
-+++ libxml2-2.4.7/include/libxml/Makefile.am Tue Oct 30 19:06:00 2001
-@@ -33,7 +33,4 @@
- threads.h \
- globals.h
+ 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 \
+diff -Nur libxml2-2.6.17.orig/include/libxml/Makefile.am libxml2-2.6.17/include/libxml/Makefile.am
+--- libxml2-2.6.17.orig/include/libxml/Makefile.am 2005-01-04 15:55:45.000000000 +0100
++++ libxml2-2.6.17/include/libxml/Makefile.am 2005-01-18 12:08:45.978527448 +0100
+@@ -50,7 +50,4 @@
+ pattern.h \
+ xmlsave.h
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
-
- EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in
+ EXTRA_DIST = xmlversion.h.in