[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/21] meson: always probe u2f and canokey if the option is enabl
From: |
Paolo Bonzini |
Subject: |
[PATCH 07/21] meson: always probe u2f and canokey if the option is enabled |
Date: |
Thu, 21 Dec 2023 18:19:44 +0100 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 6c77d9687de..de33e323d43 100644
--- a/meson.build
+++ b/meson.build
@@ -1759,12 +1759,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
--
2.43.0
- [PATCH 00/21] Build system cleanups for QEMU 9.0, Paolo Bonzini, 2023/12/21
- [PATCH 01/21] meson: fix type of "relocatable" option, Paolo Bonzini, 2023/12/21
- [PATCH 03/21] meson: use version_compare() to compare version, Paolo Bonzini, 2023/12/21
- [PATCH 04/21] Makefile: clean qemu-iotests output, Paolo Bonzini, 2023/12/21
- [PATCH 05/21] configure: remove unnecessary subshell, Paolo Bonzini, 2023/12/21
- [PATCH 06/21] configure: unify again the case arms in probe_target_compiler, Paolo Bonzini, 2023/12/21
- [PATCH 07/21] meson: always probe u2f and canokey if the option is enabled,
Paolo Bonzini <=
- [PATCH 02/21] meson: remove unused variable, Paolo Bonzini, 2023/12/21
- [PATCH 08/21] meson: remove OS definitions from config_targetos, Paolo Bonzini, 2023/12/21
- [PATCH 09/21] meson: remove CONFIG_POSIX and CONFIG_WIN32 from config_targetos, Paolo Bonzini, 2023/12/21
- [PATCH 10/21] meson: remove config_targetos, Paolo Bonzini, 2023/12/21
- [PATCH 11/21] meson: remove CONFIG_ALL, Paolo Bonzini, 2023/12/21
- [PATCH 12/21] meson: rename config_all, Paolo Bonzini, 2023/12/21
- [PATCH 13/21] meson: add more sections to main meson.build, Paolo Bonzini, 2023/12/21