]> git.proxmox.com Git - mirror_qemu.git/commitdiff
meson: always probe u2f and canokey if the option is enabled
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 8 Sep 2023 10:10:27 +0000 (12:10 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Sun, 31 Dec 2023 08:11:28 +0000 (09:11 +0100)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
meson.build

index 21335055ef8861c378e6d59c348d72f6435c163a..7344e3638261d6b7d22f805753881b29e2154741 100644 (file)
@@ -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