meson: add libxml build dependency

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 2ab059e6d92260e09d30f5282cac483b6f8f8ee6..b22a72855bb7fc7bc8f0bc1629c1f5146bfc43ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,6 @@ fi
 
 # Check for compiler and library settings.
 
-LIBVIRT_ARG_LIBXML
 LIBVIRT_ARG_NETCF
 LIBVIRT_ARG_NLS
 LIBVIRT_ARG_NSS
@@ -125,7 +124,6 @@ LIBVIRT_ARG_VIRTUALPORT
 LIBVIRT_ARG_WIRESHARK
 LIBVIRT_ARG_YAJL
 
-LIBVIRT_CHECK_LIBXML
 LIBVIRT_CHECK_NETCF
 LIBVIRT_CHECK_NLS
 LIBVIRT_CHECK_NUMACTL
@@ -421,7 +419,6 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
 LIBVIRT_RESULT_LIBXL
-LIBVIRT_RESULT_LIBXML
 LIBVIRT_RESULT_NETCF
 LIBVIRT_RESULT_NLS
 LIBVIRT_RESULT_NSS

diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4
deleted file mode 100644 (file)
index cce54d8..0000000
--- a/m4/virt-libxml.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl The libxml-2.0 library
-dnl
-dnl Copyright (C) 2016 Red Hat, Inc.
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library.  If not, see
-dnl <http://www.gnu.org/licenses/>.
-dnl
-
-AC_DEFUN([LIBVIRT_ARG_LIBXML], [
-  LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 location], [check])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_LIBXML], [
-  LIBXML_REQUIRED="2.9.1"
-
-  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_DEFUN([LIBVIRT_RESULT_LIBXML], [
-  LIBVIRT_RESULT_LIB([LIBXML])
-])

diff --git a/meson.build b/meson.build
index 79dfae7e67480690292cece45f929a2e0fd9f1f7..5e2bf0bd6129c09b2e2200046ce5210b1b73e8e7 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1160,6 +1160,9 @@ else
   libssh2_dep = dependency('', required: false)
 endif
 
+libxml_version = '2.9.1'
+libxml_dep = dependency('libxml-2.0', version: '>=' + libxml_version)
+
 use_macvtap = false
 if not get_option('macvtap').disabled()
   if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and
@@ -1328,6 +1331,7 @@ libs_summary = {
   'libpcap': libpcap_dep.found(),
   'libssh': libssh_dep.found(),
   'libssh2': libssh2_dep.found(),
+  'libxml': libxml_dep.found(),
   'macvtap': conf.has('WITH_MACVTAP'),
   'readline': readline_dep.found(),
 }