aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2011-09-26 20:38:31 +0200
committerAndreas Schwab2011-09-26 20:38:31 +0200
commit04d51ad41a26fe75b239d29fc71965fe39799954 (patch)
tree1c9cf41e961dd9bbabe69ce55968db603d778cc0
parentec9da8404b5f400bd4a09d16490de69d4983bf52 (diff)
downloademacs-04d51ad41a26fe75b239d29fc71965fe39799954.tar.gz
emacs-04d51ad41a26fe75b239d29fc71965fe39799954.zip
* configure.in: Initialize HAVE_LIBXML2.
-rw-r--r--ChangeLog4
-rw-r--r--configure.in1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 75d0ef6a5e9..3089c8248db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-09-26 Andreas Schwab <schwab@linux-m68k.org>
2
3 * configure.in: Initialize HAVE_LIBXML2.
4
12011-09-26 Glenn Morris <rgm@gnu.org> 52011-09-26 Glenn Morris <rgm@gnu.org>
2 6
3 * make-dist: Add lib/makefile.w32-in. 7 * make-dist: Add lib/makefile.w32-in.
diff --git a/configure.in b/configure.in
index 2e2c08c3342..d2ffdd5a19e 100644
--- a/configure.in
+++ b/configure.in
@@ -2624,6 +2624,7 @@ fi
2624AC_SUBST(LIBXSM) 2624AC_SUBST(LIBXSM)
2625 2625
2626### Use libxml (-lxml2) if available 2626### Use libxml (-lxml2) if available
2627HAVE_LIBXML2=no
2627if test "${with_xml2}" != "no"; then 2628if test "${with_xml2}" != "no"; then
2628 ### I'm not sure what the version number should be, so I just guessed. 2629 ### I'm not sure what the version number should be, so I just guessed.
2629 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) 2630 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)