Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 30 ++++--------------------------
meson.build | 10 ++++++----
meson_options.txt | 2 ++
migration/meson.build | 2 +-
4 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/configure b/configure
index ea5650acca..649da881a2 100755
--- a/configure
+++ b/configure
@@ -398,7 +398,7 @@ lzo="auto"
snappy="auto"
bzip2="auto"
lzfse="auto"
-zstd="$default_feature"
+zstd="auto"
guest_agent="$default_feature"
guest_agent_with_vss="no"
guest_agent_ntddscsi="no"
@@ -1328,9 +1328,9 @@ for opt do
;;
--disable-lzfse) lzfse="disabled"
;;
- --disable-zstd) zstd="no"
+ --disable-zstd) zstd="disabled"
;;
- --enable-zstd) zstd="yes"
+ --enable-zstd) zstd="enabled"
;;
--enable-guest-agent) guest_agent="yes"
;;
@@ -2458,23 +2458,6 @@ EOF
fi
fi
-##########################################
-# zstd check
-
-if test "$zstd" != "no" ; then
- libzstd_minver="1.4.0"
- if $pkg_config --atleast-version=$libzstd_minver libzstd ; then
- zstd_cflags="$($pkg_config --cflags libzstd)"
- zstd_libs="$($pkg_config --libs libzstd)"
- zstd="yes"
- else
- if test "$zstd" = "yes" ; then
- feature_not_found "libzstd" "Install libzstd devel"
- fi
- zstd="no"
- fi
-fi
-
##########################################
# libseccomp check
@@ -6070,12 +6053,6 @@ if test "$avx512f_opt" = "yes" ; then
echo "CONFIG_AVX512F_OPT=y" >> $config_host_mak
fi
-if test "$zstd" = "yes" ; then
- echo "CONFIG_ZSTD=y" >> $config_host_mak
- echo "ZSTD_CFLAGS=$zstd_cflags" >> $config_host_mak
- echo "ZSTD_LIBS=$zstd_libs" >> $config_host_mak
-fi
-
if test "$seccomp" = "yes"; then
echo "CONFIG_SECCOMP=y" >> $config_host_mak
echo "SECCOMP_CFLAGS=$seccomp_cflags" >> $config_host_mak
@@ -6629,6 +6606,7 @@ NINJA=$ninja $meson setup \
-Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \
-Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
-Dlibssh=$libssh -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
+ -Dzstd=$zstd \
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
-Dvhost_user_blk_server=$vhost_user_blk_server \
-Dfuse=$fuse -Dfuse_lseek=$fuse_lseek \
diff --git a/meson.build b/meson.build
index c02d9c3e1a..93a95d7a7f 100644
--- a/meson.build
+++ b/meson.build
@@ -380,9 +380,10 @@ if not get_option('libiscsi').auto() or have_block
method: 'pkg-config', static: enable_static)
endif
zstd = not_found
-if 'CONFIG_ZSTD' in config_host
- zstd = declare_dependency(compile_args: config_host['ZSTD_CFLAGS'].split(),
- link_args: config_host['ZSTD_LIBS'].split())
+if not get_option('zstd').auto() or have_block
+ zstd = dependency('zstd', version: '>=1.4.0',
-> libzstd
Interestingly, meson didn't seem to overwrite config-host.h correctly (that's how I noticed failed to link). I removed it and now it regenerates it correctly.. weird.