fixing compilation and link option when configuring with --without-valid
* debugXML.c relaxng.c valid.c xinclude.c xmllint.c xmlreader.c:
fixing compilation and link option when configuring with
--without-valid should fix #135309
Daniel
diff --git a/xmlreader.c b/xmlreader.c
index e78b286..8a533a2 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -877,6 +877,7 @@
xmlTextReaderValidatePush(xmlTextReaderPtr reader ATTRIBUTE_UNUSED) {
xmlNodePtr node = reader->node;
+#ifdef LIBXML_VALID_ENABLED
if ((reader->validate == XML_TEXTREADER_VALIDATE_DTD) &&
(reader->ctxt != NULL) && (reader->ctxt->validate == 1)) {
if ((node->ns == NULL) || (node->ns->prefix == NULL)) {
@@ -894,8 +895,10 @@
if (qname != NULL)
xmlFree(qname);
}
+ }
+#endif /* LIBXML_VALID_ENABLED */
#ifdef LIBXML_SCHEMAS_ENABLED
- } else if ((reader->validate == XML_TEXTREADER_VALIDATE_RNG) &&
+ if ((reader->validate == XML_TEXTREADER_VALIDATE_RNG) &&
(reader->rngValidCtxt != NULL)) {
int ret;
@@ -920,8 +923,8 @@
}
if (ret != 1)
reader->rngValidErrors++;
-#endif
}
+#endif
}
/**
@@ -935,12 +938,15 @@
static void
xmlTextReaderValidateCData(xmlTextReaderPtr reader,
const xmlChar *data, int len) {
+#ifdef LIBXML_VALID_ENABLED
if ((reader->validate == XML_TEXTREADER_VALIDATE_DTD) &&
(reader->ctxt != NULL) && (reader->ctxt->validate == 1)) {
reader->ctxt->valid &= xmlValidatePushCData(&reader->ctxt->vctxt,
data, len);
+ }
+#endif /* LIBXML_VALID_ENABLED */
#ifdef LIBXML_SCHEMAS_ENABLED
- } else if ((reader->validate == XML_TEXTREADER_VALIDATE_RNG) &&
+ if ((reader->validate == XML_TEXTREADER_VALIDATE_RNG) &&
(reader->rngValidCtxt != NULL)) {
int ret;
@@ -948,8 +954,8 @@
ret = xmlRelaxNGValidatePushCData(reader->rngValidCtxt, data, len);
if (ret != 1)
reader->rngValidErrors++;
-#endif
}
+#endif
}
/**
@@ -962,6 +968,7 @@
xmlTextReaderValidatePop(xmlTextReaderPtr reader) {
xmlNodePtr node = reader->node;
+#ifdef LIBXML_VALID_ENABLED
if ((reader->validate == XML_TEXTREADER_VALIDATE_DTD) &&
(reader->ctxt != NULL) && (reader->ctxt->validate == 1)) {
if ((node->ns == NULL) || (node->ns->prefix == NULL)) {
@@ -979,8 +986,10 @@
if (qname != NULL)
xmlFree(qname);
}
+ }
+#endif /* LIBXML_VALID_ENABLED */
#ifdef LIBXML_SCHEMAS_ENABLED
- } else if ((reader->validate == XML_TEXTREADER_VALIDATE_RNG) &&
+ if ((reader->validate == XML_TEXTREADER_VALIDATE_RNG) &&
(reader->rngValidCtxt != NULL)) {
int ret;
@@ -994,8 +1003,8 @@
node);
if (ret != 1)
reader->rngValidErrors++;
-#endif
}
+#endif
}
/**