diff --git a/configure.ac b/configure.ac index 7e4e2bab9a..d024e1c7e4 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 a73050a8b1..0000000000 --- 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 . -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 d265545538..4cf6c588b2 100644 --- a/meson.build +++ b/meson.build @@ -1099,6 +1099,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