# HG changeset patch
# User Daniel Veillard <veillard@src.gnome.org>
# Date 1071069326 0
#      Wed Dec 10 15:15:26 2003 +0000
# Node ID ae822e641c9ac2d411d50f2b033c60ee79068c9d
# Parent  33947a999d4ac96736ef96b722a5ec66419bb211
upp'ed the dependancy to libxml2-2.6.3 fixed #127473 by using the new

* configure.in: upp'ed the dependancy to libxml2-2.6.3
* libxslt/documents.c xsltproc/xsltproc.c: fixed #127473
  by using the new XInclude APIs provided by 2.6.3...
Daniel

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 10 16:13:38 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in: upp'ed the dependancy to libxml2-2.6.3
+	* libxslt/documents.c xsltproc/xsltproc.c: fixed #127473
+	  by using the new XInclude APIs provided by 2.6.3...
+
 Mon Dec  8 23:34:32 HKT 2003 William Brack <wbrack@mmm.com.hk>
 
 	* libxslt/transform.c, libxslt/xslt.c: modified to assure
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=8
 LIBEXSLT_MICRO_VERSION=0
-LIBXML_REQUIRED_VERSION=2.6.0
+LIBXML_REQUIRED_VERSION=2.6.3
 
 
 LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
diff --git a/libxslt/documents.c b/libxslt/documents.c
--- a/libxslt/documents.c
+++ b/libxslt/documents.c
@@ -202,7 +202,11 @@
 
     if (ctxt->xinclude != 0) {
 #ifdef LIBXML_XINCLUDE_ENABLED
+#if LIBXML_VERSION >= 20603
+	xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS);
+#else
 	xmlXIncludeProcess(doc);
+#endif
 #else
 	xsltTransformError(ctxt, NULL, NULL,
 	    "xsltLoadDocument(%s) : XInclude processing not compiled in\n",
diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -374,7 +374,11 @@
     if (xinclude) {
 	if (timing)
 	    startTimer();
+#if LIBXML_VERSION >= 20603
+	xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS);
+#else
 	xmlXIncludeProcess(doc);
+#endif
 	if (timing) {
 	    endTimer("XInclude processing %s", filename);
 	}