summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-08-10 21:22:33 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-08-10 21:22:33 +0000
commit12266111955bb0b5e5a974104c7599a830121573 (patch)
tree64b632a51803f39301a1d990e15ae652fbdc180f
parent5b7ad1a24c38b33995245a56d0ba242febd7a767 (diff)
* configure.in: add a version (>= 2.6.0) check for libxml2
-rw-r--r--ChangeLog4
-rw-r--r--configure.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f33eb93d..e41b8c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-08-10 John (J5) Palmieri <johnp@redhat.com>
+ * configure.in: add a version (>= 2.6.0) check for libxml2
+
+2006-08-10 John (J5) Palmieri <johnp@redhat.com>
+
* configure.in: make sure the compiler supports -Wfloat-equal
* bus/dir-watch-dnotify.c: move functional code after
diff --git a/configure.in b/configure.in
index 48382b56..2465d824 100644
--- a/configure.in
+++ b/configure.in
@@ -619,7 +619,7 @@ AC_CHECK_LIB(expat, XML_ParserCreate_MM,
[ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
have_expat=false)
-PKG_CHECK_MODULES(LIBXML, libxml-2.0, have_libxml=true, have_libxml=false)
+PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.0, have_libxml=true, have_libxml=false)
# see what we want to use
dbus_use_libxml=false
@@ -632,7 +632,7 @@ if test x$with_xml = xexpat; then
elif test x$with_xml = xlibxml; then
dbus_use_libxml=true
if ! $have_libxml ; then
- AC_MSG_ERROR([Explicitly requested libxml but libxml not found])
+ AC_MSG_ERROR([Explicitly requested libxml but libxml >= 2.6.0 not found])
fi
else
### expat is the default because libxml can't currently survive