From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Cole Robinson <crobinso@redhat.com>
Subject: [PATCH 2/4] configure: Allow vnc to get disabled with --without-default-features
Date: Tue, 13 Jul 2021 11:31:53 +0200 [thread overview]
Message-ID: <20210713093155.677589-3-thuth@redhat.com> (raw)
In-Reply-To: <20210713093155.677589-1-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>
---
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
next prev parent reply other threads:[~2021-07-13 9:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 9:31 [PATCH 0/4] Fixes for the --without-default-features configure switch Thomas Huth
2021-07-13 9:31 ` [PATCH 1/4] configure: Fix --without-default-features propagation to meson Thomas Huth
2021-07-13 16:42 ` Philippe Mathieu-Daudé
2021-07-14 5:43 ` Markus Armbruster
2021-07-14 7:35 ` Thomas Huth
2021-07-14 9:14 ` Philippe Mathieu-Daudé
2021-07-13 9:31 ` Thomas Huth [this message]
2021-07-13 9:31 ` [PATCH 3/4] configure: Fix the default setting of the "xen" feature Thomas Huth
2021-07-13 9:31 ` [PATCH 4/4] configure: Let --without-default-features disable vhost-kernel and vhost-vdpa Thomas Huth
2021-07-13 14:54 ` [PATCH 0/4] Fixes for the --without-default-features configure switch Cole Robinson
2021-07-14 15:06 ` Paolo Bonzini
2021-07-14 15:06 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210713093155.677589-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=crobinso@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).