[libvirt PATCH 047/351] meson: add fuse build dependency
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 3 ---
m4/virt-fuse.m4 | 30 ------------------------------
meson.build | 7 +++++++
meson_options.txt | 1 +
4 files changed, 8 insertions(+), 33 deletions(-)
delete mode 100644 m4/virt-fuse.m4
diff --git a/configure.ac b/configure.ac
index 086505d95f6..b136bf6a4cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,6 @@ fi
# Check for compiler and library settings.
-LIBVIRT_ARG_FUSE
LIBVIRT_ARG_GLUSTER
LIBVIRT_ARG_HAL
LIBVIRT_ARG_LIBISCSI
@@ -135,7 +134,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL
-LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLIB
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_GNUTLS
@@ -451,7 +449,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([])
-LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_GLIB
LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_GNUTLS
diff --git a/m4/virt-fuse.m4 b/m4/virt-fuse.m4
deleted file mode 100644
index cc5726fe646..00000000000
--- a/m4/virt-fuse.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl The libfuse.so library
-dnl
-dnl Copyright (C) 2012-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
-
-AC_DEFUN([LIBVIRT_ARG_FUSE],[
- LIBVIRT_ARG_WITH_FEATURE([FUSE], [fuse], [check], [2.8.6])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_FUSE],[
- LIBVIRT_CHECK_PKG([FUSE], [fuse], [2.8.6])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_FUSE],[
- LIBVIRT_RESULT_LIB([FUSE])
-])
diff --git a/meson.build b/meson.build
index 573a414b846..7ed5a0218f9 100644
--- a/meson.build
+++ b/meson.build
@@ -1033,6 +1033,12 @@ if dlopen_dep.found()
conf.set('HAVE_DLFCN_H', 1)
endif
+fuse_version = '2.8.6'
+fuse_dep = dependency('fuse', version: '>=' + fuse_version, required:
get_option('fuse'))
+if fuse_dep.found()
+ conf.set('WITH_FUSE', 1)
+endif
+
# 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)
@@ -1168,6 +1174,7 @@ libs_summary = {
'dlopen': dlopen_dep.found(),
'firewalld': conf.has('WITH_FIREWALLD'),
'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'),
+ 'fuse': fuse_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 75417751dd6..9aae950b8ca 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,4 +20,5 @@ option('curl', type: 'feature', value: 'auto',
description: 'curl support')
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('readline', type: 'feature', value: 'auto', description:
'readline support')
--
2.26.2