External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Add mkfs and libblkid to build system

Browse Source
This commit is contained in:
Osier Yang 2011-06-14 16:16:39 +08:00
parent 50c82157e1
commit 660cb2530f
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
configure.ac
View File

@ -73,6 +73,7 @@ OPENWSMAN_REQUIRED="2.2.3"
LIBPCAP_REQUIRED="1.0.0" LIBPCAP_REQUIRED="1.0.0"
LIBNL_REQUIRED="1.1" LIBNL_REQUIRED="1.1"
LIBSSH2_REQUIRED="1.0" LIBSSH2_REQUIRED="1.0"
LIBBLKID_REQUIRED="2.17"
dnl Checks for C compiler. dnl Checks for C compiler.
AC_PROG_CC AC_PROG_CC
@ -1643,12 +1644,15 @@ fi
if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then
AC_PATH_PROG([MOUNT], [mount], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([MOUNT], [mount], [], [$PATH:/sbin:/usr/sbin])
AC_PATH_PROG([UMOUNT], [umount], [], [$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 "$with_storage_fs" = "yes" ; then
if test -z "$MOUNT" ; then AC_MSG_ERROR([We need mount for FS storage driver]) ; fi 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 "$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 else
if test -z "$MOUNT" ; then with_storage_fs=no ; fi if test -z "$MOUNT" ; then with_storage_fs=no ; fi
if test -z "$UMOUNT" ; 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 if test "$with_storage_fs" = "check" ; then with_storage_fs=yes ; fi
fi fi
@ -1659,6 +1663,8 @@ if test "$with_storage_fs" = "yes" || test "$with_storage_fs" = "check"; then
[Location or name of the mount program]) [Location or name of the mount program])
AC_DEFINE_UNQUOTED([UMOUNT],["$UMOUNT"], AC_DEFINE_UNQUOTED([UMOUNT],["$UMOUNT"],
[Location or name of the mount program]) [Location or name of the mount program])
AC_DEFINE_UNQUOTED([MKFS],["$MKFS"],
[Location or name of the mkfs program])
fi fi
fi fi
AM_CONDITIONAL([WITH_STORAGE_FS], [test "$with_storage_fs" = "yes"]) AM_CONDITIONAL([WITH_STORAGE_FS], [test "$with_storage_fs" = "yes"])
@ -2304,6 +2310,26 @@ if test "$with_nwfilter" = "yes" ; then
fi fi
AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) 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" = "xyes"; then
AC_DEFINE([HAVE_LIBBLKID], [1], [libblkid is present])
fi
AM_CONDITIONAL([HAVE_LIBBLKID], [test "x$with_libblkid" = "xyes"])
AC_ARG_WITH([qemu-user], AC_ARG_WITH([qemu-user],
AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]), AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]),
[QEMU_USER=${withval}], [QEMU_USER=${withval}],

4
libvirt.spec.in
View File

@ -281,6 +281,10 @@ Requires: PolicyKit >= 0.6
%endif %endif
%if %{with_storage_fs} %if %{with_storage_fs}
Requires: nfs-utils Requires: nfs-utils
# For mkfs
Requires: util-linux-ng
# For pool-build probing for existing pools
BuildRequires: libblkid-devel >= 2.17
# For glusterfs # For glusterfs
%if 0%{?fedora} >= 11 %if 0%{?fedora} >= 11
Requires: glusterfs-client >= 2.0.1 Requires: glusterfs-client >= 2.0.1