diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-08-09 11:04:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-08-09 11:04:27 +0100 |
| commit | 632eda54043d6f26ff87dac16233e14b4708b967 (patch) | |
| tree | cd082af5778ef0d0fa5d42445696b20be61fcc49 | |
| parent | dee64246ded3aa7dbada68b96ce1c64e5bea327d (diff) | |
| parent | abc14fd05606274d8350f1f90d1ec7bc9e51aa21 (diff) | |
| download | focaccia-qemu-632eda54043d6f26ff87dac16233e14b4708b967.tar.gz focaccia-qemu-632eda54043d6f26ff87dac16233e14b4708b967.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Fix for gnutls-crypto detection # gpg: Signature made Mon 09 Aug 2021 10:43:32 BST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: meson: fix logic for gnutls check Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index af9bbb83db..b3e7ec0e92 100644 --- a/meson.build +++ b/meson.build @@ -824,7 +824,7 @@ endif gnutls = not_found gnutls_crypto = not_found -if not get_option('gnutls').auto() or have_system +if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_system) # For general TLS support our min gnutls matches # that implied by our platform support matrix # |