External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add storage gluster build option

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-04-30 11:07:59 +02:00
parent 9b86c4965f
commit 368e7f666a
4 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -141,7 +141,6 @@ LIBVIRT_STORAGE_ARG_SCSI
LIBVIRT_STORAGE_ARG_MPATH
LIBVIRT_STORAGE_ARG_RBD
LIBVIRT_STORAGE_ARG_SHEEPDOG
LIBVIRT_STORAGE_ARG_GLUSTER
LIBVIRT_STORAGE_ARG_ZFS
LIBVIRT_STORAGE_ARG_VSTORAGE
@ -153,7 +152,6 @@ if test "$with_libvirtd" = "no"; then
with_storage_mpath=no
with_storage_rbd=no
with_storage_sheepdog=no
with_storage_gluster=no
with_storage_zfs=no
with_storage_vstorage=no
fi
@ -165,7 +163,6 @@ LIBVIRT_STORAGE_CHECK_SCSI
LIBVIRT_STORAGE_CHECK_MPATH
LIBVIRT_STORAGE_CHECK_RBD
LIBVIRT_STORAGE_CHECK_SHEEPDOG
LIBVIRT_STORAGE_CHECK_GLUSTER
LIBVIRT_STORAGE_CHECK_ZFS
LIBVIRT_STORAGE_CHECK_VSTORAGE
@ -232,7 +229,6 @@ LIBVIRT_STORAGE_RESULT_SCSI
LIBVIRT_STORAGE_RESULT_MPATH
LIBVIRT_STORAGE_RESULT_RBD
LIBVIRT_STORAGE_RESULT_SHEEPDOG
LIBVIRT_STORAGE_RESULT_GLUSTER
LIBVIRT_STORAGE_RESULT_ZFS
LIBVIRT_STORAGE_RESULT_VSTORAGE
AC_MSG_NOTICE([])

43
m4/virt-storage-gluster.m4
View File

@ -1,43 +0,0 @@
dnl The storage Gluster 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_GLUSTER], [
LIBVIRT_ARG_WITH_FEATURE([STORAGE_GLUSTER], [Gluster backend for the storage driver],
[check])
])
AC_DEFUN([LIBVIRT_STORAGE_CHECK_GLUSTER], [
AC_REQUIRE([LIBVIRT_CHECK_GLUSTER])
if test "$with_storage_gluster" = "check"; then
with_storage_gluster=$with_glusterfs
fi
if test "$with_storage_gluster" = "yes"; then
if test "$with_glusterfs" = no; then
AC_MSG_ERROR([Need glusterfs (libgfapi) for gluster storage driver])
fi
AC_DEFINE_UNQUOTED([WITH_STORAGE_GLUSTER], [1],
[whether Gluster backend for storage driver is enabled])
fi
AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"])
])
AC_DEFUN([LIBVIRT_STORAGE_RESULT_GLUSTER], [
LIBVIRT_RESULT([Gluster], [$with_storage_gluster])
])

8
meson.build
View File

@ -1938,6 +1938,13 @@ if conf.has('WITH_LIBVIRTD')
conf.set_quoted('SHOWMOUNT', showmount_path)
endif
endif
if not get_option('storage_gluster').disabled() and glusterfs_dep.found()
use_storage = true
conf.set('WITH_STORAGE_GLUSTER', 1)
elif get_option('storage_gluster').enabled()
error('Need glusterfs (libgfapi) for gluster storage driver')
endif
endif
if use_storage
@ -1987,6 +1994,7 @@ storagedriver_summary = {
'FS': conf.has('WITH_STORAGE_FS'),
'NetFS': conf.has('WITH_STORAGE_FS'),
'Disk': conf.has('WITH_STORAGE_DISK'),
'Gluster': conf.has('WITH_STORAGE_GLUSTER'),
}
summary(storagedriver_summary, section: 'Storage Drivers', bool_yn: true)

1
meson_options.txt
View File

@ -78,3 +78,4 @@ option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SE
option('storage_dir', type: 'feature', value: 'auto', description: 'directory backand for the storage driver')
option('storage_disk', type: 'feature', value: 'auto', description: 'GPartd Disk backend for the storage driver')
option('storage_fs', type: 'feature', value: 'auto', description: 'FileSystem backend for the storage driver')
option('storage_gluster', type: 'feature', value: 'auto', description: 'Gluster backend for the storage driver')