diff --git a/ChangeLog b/ChangeLog index 33947a999d4ac96736ef96b722a5ec66419bb211_Q2hhbmdlTG9n..ae822e641c9ac2d411d50f2b033c60ee79068c9d_Q2hhbmdlTG9n 100644 --- 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 index 33947a999d4ac96736ef96b722a5ec66419bb211_Y29uZmlndXJlLmlu..ae822e641c9ac2d411d50f2b033c60ee79068c9d_Y29uZmlndXJlLmlu 100644 --- 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 index 33947a999d4ac96736ef96b722a5ec66419bb211_bGlieHNsdC9kb2N1bWVudHMuYw==..ae822e641c9ac2d411d50f2b033c60ee79068c9d_bGlieHNsdC9kb2N1bWVudHMuYw== 100644 --- a/libxslt/documents.c +++ b/libxslt/documents.c @@ -202,4 +202,7 @@ if (ctxt->xinclude != 0) { #ifdef LIBXML_XINCLUDE_ENABLED +#if LIBXML_VERSION >= 20603 + xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS); +#else xmlXIncludeProcess(doc); @@ -205,4 +208,5 @@ 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 index 33947a999d4ac96736ef96b722a5ec66419bb211_eHNsdHByb2MveHNsdHByb2MuYw==..ae822e641c9ac2d411d50f2b033c60ee79068c9d_eHNsdHByb2MveHNsdHByb2MuYw== 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -374,4 +374,7 @@ if (xinclude) { if (timing) startTimer(); +#if LIBXML_VERSION >= 20603 + xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS); +#else xmlXIncludeProcess(doc); @@ -377,4 +380,5 @@ xmlXIncludeProcess(doc); +#endif if (timing) { endTimer("XInclude processing %s", filename); }