[libvirt PATCH 056/351] meson: add libparted dependency
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 1 -
m4/virt-parted.m4 | 38 --------------------------------------
meson.build | 11 +++++++++++
3 files changed, 11 insertions(+), 39 deletions(-)
delete mode 100644 m4/virt-parted.m4
diff --git a/configure.ac b/configure.ac
index 755fe0073f0..b09a185c053 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL
-LIBVIRT_CHECK_LIBPARTED
LIBVIRT_CHECK_LIBPCAP
LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML
diff --git a/m4/virt-parted.m4 b/m4/virt-parted.m4
deleted file mode 100644
index a73050a8b10..00000000000
--- a/m4/virt-parted.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl The parted check
-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_LIBPARTED], [
- PARTED_REQUIRED="1.8.0"
-
- with_libparted=check
-
- LIBVIRT_CHECK_PKG([LIBPARTED], [libparted], [$PARTED_REQUIRED])
-
- if test "x$with_libparted" = "xyes"; then
- AC_PATH_PROG([PARTED], [parted], [], [$LIBVIRT_SBIN_PATH])
- if test -z "$PARTED" ; then
- with_libparted=no
- fi
- fi
-
- if test "x$with_libparted" = "xyes"; then
- AC_DEFINE_UNQUOTED([PARTED], ["$PARTED"],
- [Location or name of the parted program])
- fi
-])
diff --git a/meson.build b/meson.build
index d096a531bb7..38e18f5c750 100644
--- a/meson.build
+++ b/meson.build
@@ -1083,6 +1083,17 @@ else
libnl_dep = dependency('', required: false)
endif
+libparted_version = '1.8.0'
+libparted_dep = dependency('libparted', version: '>=' +
libparted_version, required: false)
+if libparted_dep.found()
+ parted_prog = find_program('parted', required: false, dirs: libvirt_sbin_path)
+ if parted_prog.found()
+ conf.set_quoted('PARTED', parted_prog.path())
+ else
+ libparted_dep = dependency('', required: false)
+ endif
+endif
+
use_macvtap = false
if not get_option('macvtap').disabled()
if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and
--
2.26.2