Commit 6b4914d2 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

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

parent 7a65a0b2
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.
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment