Skip to content
Snippets Groups Projects
Commit ae822e641c9a authored by Daniel Veillard's avatar Daniel Veillard
Browse files

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
parent 33947a999d4a
No related branches found
No related tags found
No related merge requests found
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> Mon Dec 8 23:34:32 HKT 2003 William Brack <wbrack@mmm.com.hk>
* libxslt/transform.c, libxslt/xslt.c: modified to assure * libxslt/transform.c, libxslt/xslt.c: modified to assure
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
LIBEXSLT_MAJOR_VERSION=0 LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=8 LIBEXSLT_MINOR_VERSION=8
LIBEXSLT_MICRO_VERSION=0 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 LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
......
...@@ -202,4 +202,7 @@ ...@@ -202,4 +202,7 @@
if (ctxt->xinclude != 0) { if (ctxt->xinclude != 0) {
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
#if LIBXML_VERSION >= 20603
xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS);
#else
xmlXIncludeProcess(doc); xmlXIncludeProcess(doc);
...@@ -205,4 +208,5 @@ ...@@ -205,4 +208,5 @@
xmlXIncludeProcess(doc); xmlXIncludeProcess(doc);
#endif
#else #else
xsltTransformError(ctxt, NULL, NULL, xsltTransformError(ctxt, NULL, NULL,
"xsltLoadDocument(%s) : XInclude processing not compiled in\n", "xsltLoadDocument(%s) : XInclude processing not compiled in\n",
......
...@@ -374,4 +374,7 @@ ...@@ -374,4 +374,7 @@
if (xinclude) { if (xinclude) {
if (timing) if (timing)
startTimer(); startTimer();
#if LIBXML_VERSION >= 20603
xmlXIncludeProcessFlags(doc, XSLT_PARSE_OPTIONS);
#else
xmlXIncludeProcess(doc); xmlXIncludeProcess(doc);
...@@ -377,4 +380,5 @@ ...@@ -377,4 +380,5 @@
xmlXIncludeProcess(doc); xmlXIncludeProcess(doc);
#endif
if (timing) { if (timing) {
endTimer("XInclude processing %s", filename); endTimer("XInclude processing %s", filename);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment