External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

m4/virt-parted: use LIBVIRT_CHECK_PKG

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-12 13:46:19 +01:00
parent 597efd7a26
commit b51714bd05
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1380,12 +1380,12 @@ LIBVIRT_CHECK_LIBPARTED
if test "$with_storage_disk" = "yes" ||
test "$with_storage_disk" = "check"; then
if test "$with_storage_disk" = "yes" &&
test "$PARTED_FOUND" != "yes"; then
test "$with_libparted" != "yes"; then
AC_MSG_ERROR([Need parted for disk storage driver])
fi
if test "$with_storage_disk" = "check"; then
if test "$PARTED_FOUND" != "yes"; then
if test "$with_libparted" != "yes"; then
with_storage_disk=no
else
with_storage_disk=yes

25
m4/virt-parted.m4
View File

@ -19,25 +19,20 @@ dnl
AC_DEFUN([LIBVIRT_CHECK_LIBPARTED], [
PARTED_REQUIRED="1.8.0"
LIBPARTED_CFLAGS=
LIBPARTED_LIBS=
AC_PATH_PROG([PARTED], [parted], [], [$LIBVIRT_SBIN_PATH])
if test -z "$PARTED" ; then
PARTED_FOUND=no
else
PARTED_FOUND=yes
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 "$PARTED_FOUND" = "yes" && test "x$PKG_CONFIG" != "x" ; then
PKG_CHECK_MODULES([LIBPARTED], [libparted >= $PARTED_REQUIRED], [],
[PARTED_FOUND=no])
fi
if test "$PARTED_FOUND" = "yes"; then
if test "x$with_libparted" = "xyes"; then
AC_DEFINE_UNQUOTED([PARTED], ["$PARTED"],
[Location or name of the parted program])
fi
AC_SUBST([LIBPARTED_CFLAGS])
AC_SUBST([LIBPARTED_LIBS])
])