summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huth2021-09-06 17:39:39 +0200
committerPaolo Bonzini2021-09-13 13:56:26 +0200
commit95e2289fdac8e329f3282e943715e2a5c4e3177b (patch)
tree6a32d38852dfcd70f927526c51a6fca9b82a8a8c
parentdocs/system: move x86 CPU configuration to a separate document (diff)
downloadqemu-95e2289fdac8e329f3282e943715e2a5c4e3177b.tar.gz
qemu-95e2289fdac8e329f3282e943715e2a5c4e3177b.tar.xz
qemu-95e2289fdac8e329f3282e943715e2a5c4e3177b.zip
meson.build: Do not look for VNC-related libraries if have_system is not set
When running "./configure --static --disable-system" there is currently a warning if the static version of libpng is missing: WARNING: Static library 'png16' not found for dependency 'libpng', may not be statically linked Since it does not make sense to look for the VNC-related libraries at all when we're building without system emulator binaries, let's add a check for have_system here to silence this warning. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210906153939.165567-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 7e58e6279b..f07236d947 100644
--- a/meson.build
+++ b/meson.build
@@ -931,7 +931,7 @@ vnc = not_found
png = not_found
jpeg = not_found
sasl = not_found
-if not get_option('vnc').disabled()
+if have_system and not get_option('vnc').disabled()
vnc = declare_dependency() # dummy dependency
png = dependency('libpng', required: get_option('vnc_png'),
method: 'pkg-config', kwargs: static_kwargs)