patch from Mark Vakoc that allows compiling with XInclude but without
* xinclude.c: patch from Mark Vakoc that allows compiling
with XInclude but without XPointer support.
Daniel
diff --git a/ChangeLog b/ChangeLog
index 71d009d..7b3ba64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 1 22:55:09 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+ * xinclude.c: patch from Mark Vakoc that allows compiling
+ with XInclude but without XPointer support.
+
Mon Sep 1 22:31:38 CEST 2003 Daniel Veillard <daniel@veillard.com>
* configure.in xml2-config.in: Applied a patch from Kevin P. Fleming
diff --git a/xinclude.c b/xinclude.c
index 9f1a45b..ef53542 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -1116,8 +1116,10 @@
}
break;
}
+#ifdef LIBXML_XPTR_ENABLED
case XPATH_RANGE:
return(xmlXIncludeCopyRange(ctxt, target, source, obj));
+#endif
case XPATH_POINT:
/* points are ignored in XInclude */
break;
@@ -1406,7 +1408,9 @@
ctxt->incTab[nr]->inc = xmlXIncludeCopyNodeList(ctxt, ctxt->doc,
doc, doc->children);
}
- } else {
+ }
+#ifdef LIBXML_XPTR_ENABLED
+ else {
/*
* Computes the XPointer expression and make a copy used
* as the replacement copy.
@@ -1530,6 +1534,7 @@
xmlXPathFreeContext(xptrctxt);
xmlFree(fragment);
}
+#endif
/*
* Do the xml:base fixup if needed