[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v4 42/43] meson.build: Do not look for VNC-related libraries if ha
From: |
Paolo Bonzini |
Subject: |
[PULL v4 42/43] meson.build: Do not look for VNC-related libraries if have_system is not set |
Date: |
Wed, 8 Sep 2021 12:04:25 +0200 |
From: Thomas Huth <thuth@redhat.com>
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>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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)
--
2.31.1
- [PULL v4 37/43] docs: standardize book titles to === with overline, (continued)
- [PULL v4 37/43] docs: standardize book titles to === with overline, Paolo Bonzini, 2021/09/08
- [PULL v4 34/43] hostmem-epc: Make prealloc consistent with qemu cmdline during reset, Paolo Bonzini, 2021/09/08
- [PULL v4 35/43] Kconfig: Add CONFIG_SGX support, Paolo Bonzini, 2021/09/08
- [PULL v4 38/43] docs: standardize directory index to --- with overline, Paolo Bonzini, 2021/09/08
- [PULL v4 41/43] docs/system: Add SGX documentation to the system manual, Paolo Bonzini, 2021/09/08
- [PULL v4 16/43] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX, Paolo Bonzini, 2021/09/08
- [PULL v4 30/43] i440fx: Add support for SGX EPC, Paolo Bonzini, 2021/09/08
- [PULL v4 20/43] i386: Add feature control MSR dependency when SGX is enabled, Paolo Bonzini, 2021/09/08
- [PULL v4 42/43] meson.build: Do not look for VNC-related libraries if have_system is not set,
Paolo Bonzini <=
- [PULL v4 43/43] ebpf: only include in system emulators, Paolo Bonzini, 2021/09/08
- Re: [PULL v4 00/43] (Mostly) x86 changes for 2021-09-06, Peter Maydell, 2021/09/09
- Re: [PULL v4 00/43] (Mostly) x86 changes for 2021-09-06, Peter Maydell, 2021/09/11