Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 10 ++++------ m4/virt-storage-dir.m4 | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 m4/virt-storage-dir.m4 diff --git a/configure.ac b/configure.ac index 8fdd388bf0..63cbae8bc2 100644 --- a/configure.ac +++ b/configure.ac @@ -555,7 +555,7 @@ fi 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_LVM], [LVM backend for 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_zfs=no fi -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"]) + +LIBVIRT_STORAGE_CHECK_DIR dnl storage-fs does not work on MacOS X @@ -1187,7 +1185,7 @@ LIBVIRT_DRIVER_RESULT_INTERFACE AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ Dir: $with_storage_dir]) +LIBVIRT_STORAGE_RESULT_DIR AC_MSG_NOTICE([ FS: $with_storage_fs]) AC_MSG_NOTICE([ NetFS: $with_storage_fs]) AC_MSG_NOTICE([ LVM: $with_storage_lvm]) diff --git a/m4/virt-storage-dir.m4 b/m4/virt-storage-dir.m4 new file mode 100644 index 0000000000..0f6880ddaf --- /dev/null +++ b/m4/virt-storage-dir.m4 @@ -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]) +]) -- 2.11.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
