meson: add glusterfs build dependency

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 56c82842e668062ce714c939471815cef903ea30..6b9d747c45e09f23c5c076f6275ae61d52d4d80d 100644 (file)
--- 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
@@ -446,7 +444,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 (file)
index 7edff40..0000000
--- 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 bdde5cfa4289ff0a3d3b8d1adf08c3472878f945..1ba73810c8431ff40311978a7bb21e93bad18ddc 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1063,6 +1063,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)
@@ -1200,6 +1203,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 64585f76e6dba2c6bf7f6d54c325fb9a2c32807e..d894f972c30b5592a1a8d804118be76dce16a6fc 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -22,6 +22,7 @@ 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')