[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/15] configure: Allow vnc to get disabled with --without-default
From: |
Paolo Bonzini |
Subject: |
[PULL 13/15] configure: Allow vnc to get disabled with --without-default-features |
Date: |
Thu, 22 Jul 2021 17:36:10 +0200 |
From: Thomas Huth <thuth@redhat.com>
There's no reason why we should keep VNC enabled when the user
specified --without-default-features.
Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210713093155.677589-3-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 19c4bc1192..468aac58e2 100755
--- a/configure
+++ b/configure
@@ -304,7 +304,7 @@ virtiofsd="auto"
virtfs="auto"
libudev="auto"
mpath="auto"
-vnc="enabled"
+vnc="auto"
sparse="auto"
vde="$default_feature"
vnc_sasl="auto"
diff --git a/meson.build b/meson.build
index eb85fe8e44..cb3856fc35 100644
--- a/meson.build
+++ b/meson.build
@@ -930,7 +930,7 @@ vnc = not_found
png = not_found
jpeg = not_found
sasl = not_found
-if get_option('vnc').enabled()
+if 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 00/15] Misc bugfix patches for 2021-07-22, Paolo Bonzini, 2021/07/22
- [PULL 01/15] qemu-config: never call the callback after an error, fix leak, Paolo Bonzini, 2021/07/22
- [PULL 06/15] qemu-config: restore "machine" in qmp_query_command_line_options(), Paolo Bonzini, 2021/07/22
- [PULL 09/15] target/i386: Added consistency checks for EFER, Paolo Bonzini, 2021/07/22
- [PULL 08/15] target/i386: Added consistency checks for CR4, Paolo Bonzini, 2021/07/22
- [PULL 04/15] chardev-spice: add missing module_obj directive, Paolo Bonzini, 2021/07/22
- [PULL 02/15] qemu-config: fix memory leak on ferror(), Paolo Bonzini, 2021/07/22
- [PULL 11/15] meson: fix dependencies for modinfo, Paolo Bonzini, 2021/07/22
- [PULL 10/15] configure: Drop obsolete check for the alloc_size attribute, Paolo Bonzini, 2021/07/22
- [PULL 13/15] configure: Allow vnc to get disabled with --without-default-features,
Paolo Bonzini <=
- [PULL 15/15] configure: Let --without-default-features disable vhost-kernel and vhost-vdpa, Paolo Bonzini, 2021/07/22
- [PULL 03/15] vl: Parse legacy default_machine_opts, Paolo Bonzini, 2021/07/22
- [PULL 07/15] target/i386: Added V_INTR_PRIO check to virtual interrupts, Paolo Bonzini, 2021/07/22
- [PULL 05/15] usb: fix usb-host dependency check, Paolo Bonzini, 2021/07/22
- [PULL 14/15] configure: Fix the default setting of the "xen" feature, Paolo Bonzini, 2021/07/22
- [PULL 12/15] configure: Fix --without-default-features propagation to meson, Paolo Bonzini, 2021/07/22
- Re: [PULL 00/15] Misc bugfix patches for 2021-07-22, Peter Maydell, 2021/07/23