Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-libxml.m4 | 36 ------------------------------------ meson.build | 4 ++++ 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 m4/virt-libxml.m4 diff --git a/configure.ac b/configure.ac index c81db75ae33..6710900fa35 100644 --- 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 @@ -423,7 +421,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 index cce54d88fb1..00000000000 --- 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 6f37862611a..55cf12a951c 100644 --- a/meson.build +++ b/meson.build @@ -1142,6 +1142,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 @@ -1310,6 +1313,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(), } -- 2.26.2
