From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 8 Sep 2023 10:10:27 +0000 (+0200)
Subject: meson: always probe u2f and canokey if the option is enabled
X-Git-Tag: v9.0.0-rc0~125^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7c22ff87aa3a71e6cad1e88c2651dde8c7d504b;p=thirdparty%2Fqemu.git

meson: always probe u2f and canokey if the option is enabled

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/meson.build b/meson.build
index 21335055ef8..7344e363826 100644
--- a/meson.build
+++ b/meson.build
@@ -1828,12 +1828,12 @@ if not get_option('smartcard').auto() or have_system
                       version: '>=2.5.1', method: 'pkg-config')
 endif
 u2f = not_found
-if have_system
+if not get_option('u2f').auto() or have_system
   u2f = dependency('u2f-emu', required: get_option('u2f'),
                    method: 'pkg-config')
 endif
 canokey = not_found
-if have_system
+if not get_option('canokey').auto() or have_system
   canokey = dependency('canokey-qemu', required: get_option('canokey'),
                    method: 'pkg-config')
 endif