diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2008-01-15 John (J5) Palmieri <johnp@redhat.com> + * portions of patch submitted by Tim Mooney + <enchanter at users dot sourceforge dot net> + + * configure.in: never auto-select libxml (FDO Bug #12479) + +2008-01-15 John (J5) Palmieri <johnp@redhat.com> + * patches by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com> * dbus/dbus-sysdeps-unix (_dbus_get_autolaunch_address): handle OOM diff --git a/configure.in b/configure.in index 78a8614b..8436d273 100644 --- a/configure.in +++ b/configure.in @@ -805,8 +805,6 @@ 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 >= 2.6.0, have_libxml=true, have_libxml=false) - # see what we want to use dbus_use_libxml=false dbus_use_expat=false @@ -817,6 +815,8 @@ if test x$with_xml = xexpat; then fi elif test x$with_xml = xlibxml; then dbus_use_libxml=true + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.0, have_libxml=true, have_libxml=false) + if ! $have_libxml ; then AC_MSG_ERROR([Explicitly requested libxml but libxml not found]) fi |