configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8 as a fallback.

diff --git a/ChangeLog b/ChangeLog
index 91eb430f3fb8e132bdc586e60dd3346d6454acbf..15241e6eba0da93c522c47cc1cc369ab86927308 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8
+       as a fallback.
+
 2013-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * .bzrignore: Don't unignore cl-loaddefs.el.

diff --git a/configure.ac b/configure.ac
index 6e5c888b4378165f4b2cff9569b526b4158a6328..6a360a89c1eddf2753641cebcd459a020da1a370 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3106,6 +3106,19 @@ HAVE_LIBXML2=no
 if test "${with_xml2}" != "no"; then
   ### I'm not sure what the version number should be, so I just guessed.
   PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+  # Built-in libxml2 on OS X 10.8 lacks libxml-2.0.pc.
+  if test "${HAVE_LIBXML2}" != "yes" -a "$opsys" = "darwin"; then
+    SAVE_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
+    AC_CHECK_HEADER(libxml/HTMLparser.h,
+      [AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, ,
+                    [#include <libxml/HTMLparser.h>])])
+    CPPFLAGS="$SAVE_CPPFLAGS"
+    if test "${HAVE_LIBXML2}" = "yes"; then
+      LIBXML2_LIBS="-lxml2"
+      LIBXML2_CFLAGS="-I/usr/include/libxml2"
+    fi
+  fi
   if test "${HAVE_LIBXML2}" = "yes"; then
     if test "${opsys}" != "mingw32"; then
       LIBS="$LIBXML2_LIBS $LIBS"