External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add libparted dependency

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-04-29 12:08:51 +02:00
parent f596485601
commit afb379fa63
3 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -130,7 +130,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_LIBPARTED
LIBVIRT_CHECK_LIBPCAP LIBVIRT_CHECK_LIBPCAP
LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_LIBXML

38
m4/virt-parted.m4
View File

@ -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
])

11
meson.build
View File

@ -1099,6 +1099,17 @@ else
libnl_dep = dependency('', required: false) libnl_dep = dependency('', required: false)
endif 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 use_macvtap = false
if not get_option('macvtap').disabled() if not get_option('macvtap').disabled()
if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and if (cc.has_header_symbol('linux/if_link.h', 'MACVLAN_MODE_BRIDGE') and