[libvirt PATCH 043/351] meson: add devmapper build dependency

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 1 - m4/virt-devmapper.m4 | 32 -------------------------------- meson.build | 13 +++++++++++++ 3 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-devmapper.m4 diff --git a/configure.ac b/configure.ac index 3499b372036..9bb397d8e3e 100644 --- a/configure.ac +++ b/configure.ac @@ -141,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_DEVMAPPER LIBVIRT_CHECK_DLOPEN LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD_ZONE diff --git a/m4/virt-devmapper.m4 b/m4/virt-devmapper.m4 deleted file mode 100644 index 165caa69685..00000000000 --- a/m4/virt-devmapper.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl The devmapper 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_CHECK_DEVMAPPER], [ - DEVMAPPER_REQUIRED=1.0.0 - - with_devmapper=check - - LIBVIRT_CHECK_PKG([DEVMAPPER], [devmapper], [$DEVMAPPER_REQUIRED], []) - - if test "x$with_devmapper" = "xno"; then - # devmapper is missing pkg-config files in ubuntu, suse, etc - with_devmapper=check - LIBVIRT_CHECK_LIB([DEVMAPPER], [devmapper], [dm_task_run], [libdevmapper.h]) - fi -]) diff --git a/meson.build b/meson.build index 081641c8617..01525c05055 100644 --- a/meson.build +++ b/meson.build @@ -1011,6 +1011,19 @@ if dbus_dep.found() endif endif +devmapper_version = '1.0.0' +devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false) +if not devmapper_dep.found() + # devmapper is missing pkg-config files in ubuntu, suse, etc + devmapper_dep = cc.find_library('devmapper', required: false) + if devmapper_dep.found() and not cc.has_function('dm_task_run', dependencies: tmp) + devmapper_dep = dependency('', required: false) + endif +endif +if devmapper_dep.found() + conf.set('WITH_DEVMAPPER', 1) +endif + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) -- 2.26.2