More XML related definitions are now more friendly:

- LIBXML2_SUPPORT is defined if LibXml2 is found
- DOMDOC_SUPPORT  is defined if msxml is found
- XML_SUPPORT is defined if either of them are found

NOXML2 was removed

modified:
  storage/connect/CMakeLists.txt
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/plgdbutl.cpp
  storage/connect/plgxml.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/storage/connect/plgxml.cpp b/storage/connect/plgxml.cpp
index 6f7173d73ab..2e03875eab7 100644
--- a/storage/connect/plgxml.cpp
+++ b/storage/connect/plgxml.cpp
@@ -17,14 +17,14 @@ PXDOC GetDomDoc(PGLOBAL g, char *nsl, char *nsdf,
   } // end of GetDomDoc

 #endif   // !DOMDOC_SUPPORT

 

-#if defined(NOXML2)

+#ifndef LIBXML2_SUPPORT

 PXDOC GetLibxmlDoc(PGLOBAL g, char *nsl, char *nsdf, 

 															char *enc, PFBLOCK fp)

   {

   strcpy(g->Message, "libxml2 not supported");

   return NULL;

   } // end of GetLibxmlDoc

-#endif   // NOXML2

+#endif   // LIBXML2_SUPPORT

 

 /******************************************************************/

 /*  XMLDOCUMENT constructor.                                      */