summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huth2021-07-13 11:31:53 +0200
committerPaolo Bonzini2021-07-22 14:44:51 +0200
commit3a6a1256d46daa21210d52b2740121f4ea929e9b (patch)
tree5a0457575057e899fa0352a476d48ad82a3debb7
parentconfigure: Fix --without-default-features propagation to meson (diff)
downloadqemu-3a6a1256d46daa21210d52b2740121f4ea929e9b.tar.gz
qemu-3a6a1256d46daa21210d52b2740121f4ea929e9b.tar.xz
qemu-3a6a1256d46daa21210d52b2740121f4ea929e9b.zip
configure: Allow vnc to get disabled with --without-default-features
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>
-rwxr-xr-xconfigure2
-rw-r--r--meson.build2
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)