Signed-off-by: Max Reitz <mre...@redhat.com>
---
configure | 7 +++++++
meson.build | 6 ++++++
meson_options.txt | 2 ++
3 files changed, 15 insertions(+)
diff --git a/configure b/configure
index 83610b0db8..fc315deebe 100755
--- a/configure
+++ b/configure
@@ -448,6 +448,7 @@ meson=""
ninja=""
skip_meson=no
gettext=""
+fuse="auto"
bogus_os="no"
malloc_trim="auto"
@@ -1519,6 +1520,10 @@ for opt do
;;
--disable-libdaxctl) libdaxctl=no
;;
+ --enable-fuse) fuse="enabled"
+ ;;
+ --disable-fuse) fuse="disabled"
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -1841,6 +1846,7 @@ disabled with --disable-FEATURE, default is enabled if
available:
xkbcommon xkbcommon support
rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
libdaxctl libdaxctl support
+ fuse FUSE block device export
NOTE: The object files are built at the place where configure is launched
EOF
@@ -6982,6 +6988,7 @@ NINJA=$ninja $meson setup \
-Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt \
-Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
+ -Dfuse=$fuse \
$cross_arg \
"$PWD" "$source_path"
diff --git a/meson.build b/meson.build
index 47e32e1fcb..4e8436b456 100644
--- a/meson.build
+++ b/meson.build
@@ -736,6 +736,10 @@ if not has_malloc_trim and
get_option('malloc_trim').enabled()
endif
endif
+fuse = dependency('fuse3', required: get_option('fuse'),
+ version: '>=3.1', method: 'pkg-config',
+ static: enable_static)
+
#################
# config-host.h #
#################
@@ -768,6 +772,7 @@ config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
config_host_data.set('CONFIG_KEYUTILS', keyutils.found())
config_host_data.set('CONFIG_GETTID', has_gettid)
config_host_data.set('CONFIG_MALLOC_TRIM', has_malloc_trim)
+config_host_data.set('CONFIG_FUSE', fuse.found())
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR',
meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR',
meson.project_version().split('.')[1])
@@ -2163,6 +2168,7 @@ endif
summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')}
summary_info += {'rng-none': config_host.has_key('CONFIG_RNG_NONE')}
summary_info += {'Linux keyring':
config_host.has_key('CONFIG_SECRET_KEYRING')}
+summary_info += {'FUSE exports': fuse.found()}
summary(summary_info, bool_yn: true)
if not supported_cpus.contains(cpu)
diff --git a/meson_options.txt b/meson_options.txt
index b4f1801875..2ef4ec628f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -64,6 +64,8 @@ option('xkbcommon', type : 'feature', value : 'auto',
description: 'xkbcommon support')
option('virtiofsd', type: 'feature', value: 'auto',
description: 'build virtiofs daemon (virtiofsd)')
+option('fuse', type: 'feature', value: 'auto',
+ description: 'FUSE block device export')
option('capstone', type: 'combo', value: 'auto',
choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
--
2.26.2
