diff options
author | Tom Lane | 2012-08-17 04:05:26 +0000 |
---|---|---|
committer | Tom Lane | 2012-08-17 04:05:26 +0000 |
commit | 470d0b9789981bc91a8ef2654911d80ab6a6be57 (patch) | |
tree | 86802b7e189e61fe97f13aee1dc0c692c0d7a65e /configure | |
parent | 305557984dd964ac397c6752e9d0f14646b60f15 (diff) |
Check LIBXML_VERSION instead of testing in configure script.
We had put a test for libxml2's xmlStructuredErrorContext variable in
configure, but of course that doesn't work on Windows builds. The next
best alternative seems to be to test the LIBXML_VERSION symbol provided
by xmlversion.h.
Per report from Talha Bin Rizwan, though this fixes it in a different way
than his proposed patch.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/configure b/configure index 78a10c8c885..5449d02c9b2 100755 --- a/configure +++ b/configure @@ -23843,75 +23843,6 @@ fi -# Older versions of libxml2 lack the xmlStructuredErrorContext variable -# (which could be a macro referring to a function, if threading is enabled) -if test "$with_libxml" = yes ; then - { $as_echo "$as_me:$LINENO: checking for xmlStructuredErrorContext" >&5 -$as_echo_n "checking for xmlStructuredErrorContext... " >&6; } -if test "${pgac_cv_libxml_structerrctx+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <libxml/globals.h> - void *globptr; -int -main () -{ -globptr = xmlStructuredErrorContext - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - pgac_cv_libxml_structerrctx=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - pgac_cv_libxml_structerrctx=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $pgac_cv_libxml_structerrctx" >&5 -$as_echo "$pgac_cv_libxml_structerrctx" >&6; } - if test x"$pgac_cv_libxml_structerrctx" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XMLSTRUCTUREDERRORCONTEXT 1 -_ACEOF - - fi -fi - - # This test makes sure that run tests work at all. Sometimes a shared # library is found by the linker, but the runtime linker can't find it. # This check should come after all modifications of compiler or linker |