xml2-config is disabled, so change the configure script to use pkgconfig to find libxml2. Upstream-Status: Inappropriate Signed-off-by: Ross Burton Update context for version 9.10.3-P2. Signed-off-by: Kai Kang Update context for version 9.10.5-P3. Signed-off-by: Kai Kang --- configure.in | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/configure.in b/configure.in index 4da73a4..6f2a754 100644 --- a/configure.in +++ b/configure.in @@ -2282,26 +2282,9 @@ case "$use_libxml2" in DST_LIBXML2_INC="" ;; auto|yes) - case X`(xml2-config --version) 2>/dev/null` in - X2.[[6789]].*) - libxml2_libs=`xml2-config --libs` - libxml2_cflags=`xml2-config --cflags` - ;; - *) - if test "yes" = "$use_libxml2" ; then - AC_MSG_RESULT(no) - AC_MSG_ERROR(required libxml2 version not available) - else - libxml2_libs= - libxml2_cflags= - fi - ;; - esac - ;; - *) - if test -f "$use_libxml2/bin/xml2-config" ; then - libxml2_libs=`$use_libxml2/bin/xml2-config --libs` - libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` + if pkg-config --exists libxml-2.0 ; then + libxml2_libs=`pkg-config libxml-2.0 --libs` + libxml2_cflags=`pkg-config libxml-2.0 --cflags` fi ;; esac -- 2.1.4