From be4d0e9d0785d7c94882b086ba3e067a06a29f60 Mon Sep 17 00:00:00 2001 From: Adam Martinson Date: Mon, 1 Nov 2010 14:11:16 -0500 Subject: [PATCH] configure: Add a check/define for xmlSchemaSetValidStructuredErrors(). --- configure | 42 ++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ include/config.h.in | 3 +++ 3 files changed, 47 insertions(+) diff --git a/configure b/configure index fe7310030ca..20fff98a95a 100755 --- a/configure +++ b/configure @@ -9200,6 +9200,48 @@ if test "x$ac_cv_lib_xml2_xmlNewDocPI" = x""yes; then : $as_echo "#define HAVE_XMLNEWDOCPI 1" >>confdefs.h +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlSchemaSetValidStructuredErrors in -lxml2" >&5 +$as_echo_n "checking for xmlSchemaSetValidStructuredErrors in -lxml2... " >&6; } +if test "${ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $ac_xml_libs $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmlSchemaSetValidStructuredErrors (); +int +main () +{ +return xmlSchemaSetValidStructuredErrors (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=yes +else + ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" >&5 +$as_echo "$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" >&6; } +if test "x$ac_cv_lib_xml2_xmlSchemaSetValidStructuredErrors" = x""yes; then : + +$as_echo "#define HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS 1" >>confdefs.h + fi diff --git a/configure.ac b/configure.ac index eb3285a7793..f38aca46847 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,6 +1119,8 @@ then [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) AC_CHECK_LIB(xml2, xmlNewDocPI, [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs) + AC_CHECK_LIB(xml2, xmlSchemaSetValidStructuredErrors, + [AC_DEFINE(HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS,1,[Define if libxml2 has the xmlSchemaSetValidStructuredErrors function])],,$ac_xml_libs) ]) CPPFLAGS="$ac_save_CPPFLAGS" fi diff --git a/include/config.h.in b/include/config.h.in index 0bb6be2e68c..1c82e75ddf7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1111,6 +1111,9 @@ /* Define if libxml2 has the xmlReadMemory function */ #undef HAVE_XMLREADMEMORY +/* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ +#undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM