[libvirt PATCH 049/351] meson: add glusterfs build dependency
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 3 ---
m4/virt-gluster.m4 | 32 --------------------------------
meson.build | 4 ++++
meson_options.txt | 1 +
4 files changed, 5 insertions(+), 35 deletions(-)
delete mode 100644 m4/virt-gluster.m4
diff --git a/configure.ac b/configure.ac
index 0a8a0221206..fa9fecccc73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,6 @@ fi
# Check for compiler and library settings.
-LIBVIRT_ARG_GLUSTER
LIBVIRT_ARG_HAL
LIBVIRT_ARG_LIBISCSI
LIBVIRT_ARG_LIBPCAP
@@ -134,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL
-LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_GNUTLS
LIBVIRT_CHECK_HAL
LIBVIRT_CHECK_LIBISCSI
@@ -448,7 +446,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([])
-LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_GNUTLS
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_LIBISCSI
diff --git a/m4/virt-gluster.m4 b/m4/virt-gluster.m4
deleted file mode 100644
index 7edff40047f..00000000000
--- a/m4/virt-gluster.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl The gluster libgfapi.so library
-dnl
-dnl Copyright (C) 2013 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
-
-dnl Currently tested against Fedora 19 with glusterfs 3.4.1; earlier
-dnl versions may be possible but only with further testing
-AC_DEFUN([LIBVIRT_ARG_GLUSTER],[
- LIBVIRT_ARG_WITH_FEATURE([GLUSTERFS], [glusterfs], [check], [3.4.1])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_GLUSTER],[
- LIBVIRT_CHECK_PKG([GLUSTERFS], [glusterfs-api], [3.4.1])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_GLUSTER],[
- LIBVIRT_RESULT_LIB([GLUSTERFS])
-])
diff --git a/meson.build b/meson.build
index 132d887be2a..4ee7031b32c 100644
--- a/meson.build
+++ b/meson.build
@@ -1047,6 +1047,9 @@ glib_dep = declare_dependency(
dependencies: [ glib_dep, gobject_dep, gio_dep ],
)
+glusterfs_version = '3.4.1'
+glusterfs_dep = dependency('glusterfs-api', version: '>=' +
glusterfs_version, required: get_option('glusterfs'))
+
# readline 7.0 is the first version which includes pkg-config support
readline_version = '7.0'
readline_dep = dependency('readline', version: '>=' +
readline_version, required: false)
@@ -1184,6 +1187,7 @@ libs_summary = {
'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'),
'fuse': fuse_dep.found(),
'glib_dep': glib_dep.found(),
+ 'glusterfs': glusterfs_dep.found(),
'readline': readline_dep.found(),
}
summary(libs_summary, section: 'Libraries', bool_yn: true)
diff --git a/meson_options.txt b/meson_options.txt
index 9aae950b8ca..cc3e5bbabab 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -21,4 +21,5 @@ option('dbus', type: 'feature', value: 'auto',
description: 'dbus-1 support')
option('firewalld', type: 'feature', value: 'auto', description:
'firewalld support')
option('firewalld_zone', type: 'feature', value: 'auto',
description: 'whether to install firewalld libvirt zone')
option('fuse', type: 'feature', value: 'auto', description:
'fuse support')
+option('glusterfs', type: 'feature', value: 'auto', description:
'glusterfs support')
option('readline', type: 'feature', value: 'auto', description:
'readline support')
--
2.26.2