Changeset: 5a94f57618ac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a94f57618ac
Modified Files:
configure.ag
monetdb5/modules/atoms/xml.c
sql/test/sql_xml/Tests/All
Branch: default
Log Message:
Remove requirement for libxml2 library.
diffs (66 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1756,16 +1756,9 @@ AC_ARG_WITH([libxml2],
[have_libxml2=$withval])
AS_VAR_IF([have_libxml2], [no], [], [
PKG_CHECK_MODULES([libxml2], [libxml-2.0], [have_libxml2="yes"],
[have_libxml2="no"; why_have_libxml2="(libxml2 not found)"])
- AS_CASE([$enable_monetdb5-$have_libxml2],
- [yes-no], [
- AC_MSG_ERROR([libxml2 library not found but required for
MonetDB5])],
- [auto-no], [
- enable_monetdb5=no
- AS_VAR_IF([disable_monetdb5], [], [
- disable_monetdb5="(libxml2 library not found but
required for MonetDB5)"])])
AS_VAR_IF([have_libxml2], [yes], [
AC_DEFINE([HAVE_LIBXML], 1, [Define if you have the xml
library])])])
-AM_CONDITIONAL([HAVE_LIBXML], [test x"$have_liblxml2" != xno])
+AM_CONDITIONAL([HAVE_LIBXML], [test x"$have_libxml2" != xno])
org_have_curl=yes
diff --git a/monetdb5/modules/atoms/xml.c b/monetdb5/modules/atoms/xml.c
--- a/monetdb5/modules/atoms/xml.c
+++ b/monetdb5/modules/atoms/xml.c
@@ -17,10 +17,11 @@
#include "monetdb_config.h"
#include "xml.h"
#include "mal_interpreter.h"
+
#ifdef HAVE_LIBXML
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#endif
+
/* The xml atom is used to represent XML data. It is implemented as a
subtype of str. The first character of the string representation
indicates the type of XML data. There are three possibilities:
@@ -29,7 +30,6 @@
* A - XML name/attribute pair.
*/
-#ifdef HAVE_LIBXML
size_t
XMLquotestring(const char *s, char *buf, size_t len)
{
@@ -707,7 +707,7 @@ str XMLxml2str(str *s, xml *x) {
(void) x;
return GDKstrdup(NO_LIBXML_FATAL);
}
-str XMLstr2xml(xml *x, str *s) {
+str XMLstr2xml(xml *x, const char **s) {
(void) s;
(void) x;
return GDKstrdup(NO_LIBXML_FATAL);
diff --git a/sql/test/sql_xml/Tests/All b/sql/test/sql_xml/Tests/All
--- a/sql/test/sql_xml/Tests/All
+++ b/sql/test/sql_xml/Tests/All
@@ -1,5 +1,5 @@
funcs
load
-xml
-xml_attribute_parsing.SF-1855673
-xmlelement_segfault.SF-2812767
+HAVE_LIBXML?xml
+HAVE_LIBXML?xml_attribute_parsing.SF-1855673
+HAVE_LIBXML?xmlelement_segfault.SF-2812767
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
