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>
This commit is contained in:
Thomas Huth 2021-07-13 11:31:53 +02:00 committed by Paolo Bonzini
parent 332008e0b9
commit 3a6a1256d4
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -304,7 +304,7 @@ virtiofsd="auto"
virtfs="auto" virtfs="auto"
libudev="auto" libudev="auto"
mpath="auto" mpath="auto"
vnc="enabled" vnc="auto"
sparse="auto" sparse="auto"
vde="$default_feature" vde="$default_feature"
vnc_sasl="auto" vnc_sasl="auto"

View File

@ -930,7 +930,7 @@ vnc = not_found
png = not_found png = not_found
jpeg = not_found jpeg = not_found
sasl = not_found sasl = not_found
if get_option('vnc').enabled() if not get_option('vnc').disabled()
vnc = declare_dependency() # dummy dependency vnc = declare_dependency() # dummy dependency
png = dependency('libpng', required: get_option('vnc_png'), png = dependency('libpng', required: get_option('vnc_png'),
method: 'pkg-config', kwargs: static_kwargs) method: 'pkg-config', kwargs: static_kwargs)