[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] configure: Allow vnc to get disabled with --without-default-
From: |
Thomas Huth |
Subject: |
[PATCH 2/4] configure: Allow vnc to get disabled with --without-default-features |
Date: |
Tue, 13 Jul 2021 11:31:53 +0200 |
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>
---
configure | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 229ea52516..1974c46f6e 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 6cd2dc582a..5dedaf73e3 100644
--- a/meson.build
+++ b/meson.build
@@ -900,7 +900,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.27.0
- [PATCH 0/4] Fixes for the --without-default-features configure switch, Thomas Huth, 2021/07/13
- [PATCH 2/4] configure: Allow vnc to get disabled with --without-default-features,
Thomas Huth <=
- [PATCH 3/4] configure: Fix the default setting of the "xen" feature, Thomas Huth, 2021/07/13
- [PATCH 4/4] configure: Let --without-default-features disable vhost-kernel and vhost-vdpa, Thomas Huth, 2021/07/13
- Re: [PATCH 0/4] Fixes for the --without-default-features configure switch, Cole Robinson, 2021/07/13
- Re: [PATCH 0/4] Fixes for the --without-default-features configure switch, Paolo Bonzini, 2021/07/14