[Emacs-diffs] trunk r113105: configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8 as a fallback.

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 113105
revision-id: address@hidden
parent: address@hidden
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-21 10:03:23 +0900
message:
  configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8 as a fallback.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-06-20 20:01:51 +0000
+++ b/ChangeLog 2013-06-21 01:03:23 +0000
@@ -1,3 +1,8 @@
+2013-06-21  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * configure.ac (HAVE_LIBXML2): Try built-in libxml2 on OS X 10.8
+       as a fallback.
+
 2013-06-20  Stefan Monnier  <address@hidden>
 
        * .bzrignore: Don't unignore cl-loaddefs.el.

=== modified file 'configure.ac'
--- a/configure.ac      2013-06-20 14:15:42 +0000
+++ b/configure.ac      2013-06-21 01:03:23 +0000
@@ -3106,6 +3106,19 @@
 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"