External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: move storage dir check to its own file

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-07 08:46:51 +01:00
parent 2700764acc
commit 9f092db85a
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -555,7 +555,7 @@ fi
AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"])
LIBVIRT_ARG_WITH([STORAGE_DIR], [directory backend for the storage driver], [yes]) LIBVIRT_STORAGE_ARG_DIR
LIBVIRT_ARG_WITH([STORAGE_FS], [FileSystem backend for the storage driver], [check]) LIBVIRT_ARG_WITH([STORAGE_FS], [FileSystem backend for the storage driver], [check])
LIBVIRT_ARG_WITH([STORAGE_LVM], [LVM backend for storage driver], [check]) LIBVIRT_ARG_WITH([STORAGE_LVM], [LVM backend for storage driver], [check])
LIBVIRT_ARG_WITH([STORAGE_ISCSI], [iSCSI backend for the storage driver], [check]) LIBVIRT_ARG_WITH([STORAGE_ISCSI], [iSCSI backend for the storage driver], [check])
@ -580,10 +580,8 @@ if test "$with_libvirtd" = "no"; then
with_storage_gluster=no with_storage_gluster=no
with_storage_zfs=no with_storage_zfs=no
fi fi
if test "$with_storage_dir" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend for storage driver is enabled]) LIBVIRT_STORAGE_CHECK_DIR
fi
AM_CONDITIONAL([WITH_STORAGE_DIR], [test "$with_storage_dir" = "yes"])
dnl storage-fs does not work on MacOS X dnl storage-fs does not work on MacOS X
@ -1187,7 +1185,7 @@ LIBVIRT_DRIVER_RESULT_INTERFACE
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([Storage Drivers])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([ Dir: $with_storage_dir]) LIBVIRT_STORAGE_RESULT_DIR
AC_MSG_NOTICE([ FS: $with_storage_fs]) AC_MSG_NOTICE([ FS: $with_storage_fs])
AC_MSG_NOTICE([ NetFS: $with_storage_fs]) AC_MSG_NOTICE([ NetFS: $with_storage_fs])
AC_MSG_NOTICE([ LVM: $with_storage_lvm]) AC_MSG_NOTICE([ LVM: $with_storage_lvm])

33
m4/virt-storage-dir.m4 Normal file
View File

@ -0,0 +1,33 @@
dnl The storage dir 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_STORAGE_ARG_DIR], [
LIBVIRT_ARG_WITH([STORAGE_DIR], [directory backend for the storage driver], [yes])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_DIR], [
if test "$with_storage_dir" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend for storage driver is enabled])
fi
AM_CONDITIONAL([WITH_STORAGE_DIR], [test "$with_storage_dir" = "yes"])
])
AC_DEFUN([LIBVIRT_STORAGE_RESULT_DIR], [
LIBVIRT_RESULT([Dir], [$with_storage_dir])
])