[libvirt] [PATCH 15/89] m4/virt-libxml: use LIBVIRT_CHECK_PKG
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
m4/virt-libxml.m4 | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4
index a683f75e69..6a9d9116fe 100644
--- a/m4/virt-libxml.m4
+++ b/m4/virt-libxml.m4
@@ -23,23 +23,13 @@ AC_DEFUN([LIBVIRT_ARG_LIBXML], [
AC_DEFUN([LIBVIRT_CHECK_LIBXML], [
LIBXML_REQUIRED="2.6.0"
- LIBXML_CFLAGS=""
- LIBXML_LIBS=""
- LIBXML_FOUND="no"
- if test "x$with_libxml" = "xno" ; then
- AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED)
- AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt])
- elif test "x$with_libxml" != "xno" && test
"x$PKG_CONFIG" != "x" ; then
- PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED, [LIBXML_FOUND=yes],
[LIBXML_FOUND=no])
- fi
- if test "$LIBXML_FOUND" = "no" ; then
+ LIBVIRT_CHECK_PKG([LIBXML], [libxml-2.0], [$LIBXML_REQUIRED])
+
+ if test "$with_libxml" = "no" ; then
AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt])
fi
- AC_SUBST([LIBXML_CFLAGS])
- AC_SUBST([LIBXML_LIBS])
-
dnl xmlURI structure has query_raw?
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
--
2.11.0