meson: add devmapper 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 c98c9c46d17534041cd2f27ac9d4c98424d9f23b..59a047413abea76c8a2bc1c61bed3cf4140a98a9 100644 (file)
--- 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 (file)
index 165caa6..0000000
--- 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 68b6f1baf9f24b2a8c3fceb01c197c4333957a45..26cb2c69c5d2f9de9e56950a0883727ed68f18ee 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1027,6 +1027,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)