[libvirt] [PATCH 1/2] Add mkfs and libblkid to build system v2
Change per feedback from Dan B:
* Add libblkid dependency to libvirt.spec.in
---
configure.ac | 25 +++++++++++++++++++++++++
libvirt.spec.in | 5 +++++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 36ba703..6923ce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,7 @@ DEVMAPPER_REQUIRED=1.0.0
LIBCURL_REQUIRED="7.18.0"
LIBPCAP_REQUIRED="1.0.0"
LIBNL_REQUIRED="1.1"
+LIBBLKID_REQUIRED="2.17"
dnl Checks for C compiler.
AC_PROG_CC
@@ -1309,6 +1310,25 @@ if test "$with_nwfilter" = "yes" ; then
fi
AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"])
+dnl libblkid is used by several storage drivers; therefore we probe
+dnl for it unconditionally.
+AC_ARG_WITH([libblkid],
+ [AS_HELP_STRING([--with-libblkid],
+ [use libblkid to scan for filesystems and partitions @<:@default=check@:>@])],
+ [],
+ [with_libblkid=check])
+
+if test "x$with_libblkid" = "xyes" || test
"x$with_libblkid" = "xcheck"; then
+ PKG_CHECK_MODULES([BLKID],
+ [blkid >= $LIBBLKID_REQUIRED],
+ [with_libblkid="yes"],
+ [with_libblkid="no"])
+fi
+
+if test x"$with_libblkid" = x"yes"; then
+ AC_DEFINE([HAVE_LIBBLKID], [1], [libblkid is present])
+fi
+AM_CONDITIONAL([HAVE_LIBBLKID], [test x"$with_libblkid" = x"yes"])
AC_ARG_WITH([storage-fs],
AC_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver
@<:@default=check@:>@]),[],[with_storage_fs=check])
@@ -1342,12 +1362,15 @@ AM_CONDITIONAL([WITH_STORAGE_DIR], [test
"$with_storage_dir" = "yes"])
if test "$with_storage_fs" = "yes" || test
"$with_storage_fs" = "check"; then
AC_PATH_PROG([MOUNT], [mount], [], [$PATH:/sbin:/usr/sbin])
AC_PATH_PROG([UMOUNT], [umount], [], [$PATH:/sbin:/usr/sbin])
+ AC_PATH_PROG([MKFS], [mkfs], [], [$PATH:/sbin:/usr/sbin])
if test "$with_storage_fs" = "yes" ; then
if test -z "$MOUNT" ; then AC_MSG_ERROR([We need mount for FS storage
driver]) ; fi
if test -z "$UMOUNT" ; then AC_MSG_ERROR([We need umount for FS storage
driver]) ; fi
+ if test -z "$MKFS" ; then AC_MSG_ERROR([We need mkfs for FS storage
driver]) ; fi
else
if test -z "$MOUNT" ; then with_storage_fs=no ; fi
if test -z "$UMOUNT" ; then with_storage_fs=no ; fi
+ if test -z "$MKFS" ; then with_storage_fs=no ; fi
if test "$with_storage_fs" = "check" ; then with_storage_fs=yes ;
fi
fi
@@ -1358,6 +1381,8 @@ if test "$with_storage_fs" = "yes" || test
"$with_storage_fs" = "check"; then
[Location or name of the mount program])
AC_DEFINE_UNQUOTED([UMOUNT],["$UMOUNT"],
[Location or name of the mount program])
+ AC_DEFINE_UNQUOTED([MKFS],["$MKFS"],
+ [Location or name of the mkfs program])
fi
fi
AM_CONDITIONAL([WITH_STORAGE_FS], [test "$with_storage_fs" = "yes"])
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 6edbf2f..1bb58db 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -228,6 +228,11 @@ BuildRequires: util-linux
# For showmount in FS driver (netfs discovery)
BuildRequires: nfs-utils
Requires: nfs-utils
+# For mkfs
+Requires: util-linux
+# For pool-build probing for existing pools
+BuildRequires: libblkid-devel >= 2.17
+Requires: libblkid >= 2.17
# For glusterfs
%if 0%{?fedora} >= 11
Requires: glusterfs-client >= 2.0.1
--
1.7.0.1