[Emacs-diffs] /srv/bzr/emacs/trunk r101421: * configure.in (HAVE_LIBXML2): Check that the libxml2 we found can

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101421
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-13 16:58:48 +0200
message:
  * configure.in (HAVE_LIBXML2): Check that the libxml2 we found can
  be used.  This fixes a conf problem on Mac OS X.
modified:
  ChangeLog
  configure
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-09-10 16:44:35 +0000
+++ b/ChangeLog 2010-09-13 14:58:48 +0000
@@ -1,3 +1,8 @@
+2010-09-13  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * configure.in (HAVE_LIBXML2): Check that the libxml2 we found can
+       be used.  This fixes a conf problem on Mac OS X.
+
 2010-09-10  Lars Magne Ingebrigtsen  <address@hidden>
 
        * configure.in: Check for libxml2.

=== modified file 'configure'
--- a/configure 2010-09-13 14:42:33 +0000
+++ b/configure 2010-09-13 14:58:48 +0000
@@ -11180,9 +11180,56 @@
   fi
 
   if test "${HAVE_LIBXML2}" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in 
-lxml2" >&5
+$as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; }
+if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lxml2  $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 htmlReadMemory ();
+int
+main ()
+{
+return htmlReadMemory ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_xml2_htmlReadMemory=yes
+else
+  ac_cv_lib_xml2_htmlReadMemory=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_htmlReadMemory" >&5
+$as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; }
+if test "x$ac_cv_lib_xml2_htmlReadMemory" = x""yes; then :
+  HAVE_LIBXML2=yes
+else
+  HAVE_LIBXML2=no
+fi
+
+    if test "${HAVE_LIBXML2}" = "yes"; then
 
 $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
 
+    else
+      LIBXML2_LIBS=""
+      LIBXML2_CFLAGS=""
+    fi
   fi
 fi
 

=== modified file 'configure.in'
--- a/configure.in      2010-09-10 16:44:35 +0000
+++ b/configure.in      2010-09-13 14:58:48 +0000
@@ -2541,7 +2541,13 @@
   ### I'm not sure what the version number should be, so I just guessed.
   PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, 
HAVE_LIBXML2=no)
   if test "${HAVE_LIBXML2}" = "yes"; then
-    AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library 
(-lxml2).])
+    AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+    if test "${HAVE_LIBXML2}" = "yes"; then
+      AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library 
(-lxml2).])
+    else
+      LIBXML2_LIBS=""
+      LIBXML2_CFLAGS=""
+    fi
   fi
 fi
 AC_SUBST(LIBXML2_LIBS)