diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-28 19:33:54 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-01 08:51:32 -0400 |
| commit | 1ffb3bbb3cb1273a2ad17599dbe82f9c8d3682a2 (patch) | |
| tree | f8877e6fe1ab45fc6a386a3b383dde8dd7744acc /meson.build | |
| parent | 771f0fb8c59a0d229909b92cd8ce0284de2f2325 (diff) | |
meson: move zlib detection to meson
Meson includes the same logic that tries to look for -lz if
pkg-config (and cmake) cannot find zlib. The undocumented
--disable-zlib-test option becomes a no-op.
There is still an instance of "-lz" in the LIBS directory.
It will go away as soon as tests are converted to meson,
because the zlib dependency does not propagate from libblock.fa
to the Makefile-build unit tests.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 6b2fc76933..b68e1bdfc7 100644 --- a/meson.build +++ b/meson.build @@ -134,11 +134,7 @@ if 'CONFIG_AUTH_PAM' in config_host pam = cc.find_library('pam') endif libaio = cc.find_library('aio', required: false) -zlib = not_found -if 'CONFIG_ZLIB' in config_host - zlib = declare_dependency(compile_args: config_host['ZLIB_CFLAGS'].split(), - link_args: config_host['ZLIB_LIBS'].split()) -endif +zlib = dependency('zlib', required: true, static: enable_static) linux_io_uring = not_found if 'CONFIG_LINUX_IO_URING' in config_host linux_io_uring = declare_dependency(compile_args: config_host['LINUX_IO_URING_CFLAGS'].split(), |