瀏覽代碼

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Paolo Bonzini 1 年之前
父節點
當前提交
e7c22ff87a
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      meson.build

+ 2 - 2
meson.build

@@ -1828,12 +1828,12 @@ if not get_option('smartcard').auto() or have_system
                       version: '>=2.5.1', method: 'pkg-config')
                       version: '>=2.5.1', method: 'pkg-config')
 endif
 endif
 u2f = not_found
 u2f = not_found
-if have_system
+if not get_option('u2f').auto() or have_system
   u2f = dependency('u2f-emu', required: get_option('u2f'),
   u2f = dependency('u2f-emu', required: get_option('u2f'),
                    method: 'pkg-config')
                    method: 'pkg-config')
 endif
 endif
 canokey = not_found
 canokey = not_found
-if have_system
+if not get_option('canokey').auto() or have_system
   canokey = dependency('canokey-qemu', required: get_option('canokey'),
   canokey = dependency('canokey-qemu', required: get_option('canokey'),
                    method: 'pkg-config')
                    method: 'pkg-config')
 endif
 endif