Make it compatible with spice-common.
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx>
---
meson.build | 14 ++++++--------
meson_options.txt | 3 +--
subprojects/spice-common | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/meson.build b/meson.build
index f822cc12..1b07f30d 100644
--- a/meson.build
+++ b/meson.build
@@ -167,14 +167,12 @@ endif
# smartcard check
spice_server_has_smartcard = false
-if get_option('smartcard')
- smartcard_dep = dependency('libcacard', required : false, version : '>= 2.5.1')
- if smartcard_dep.found()
- spice_server_deps += smartcard_dep
- spice_server_config_data.set('USE_SMARTCARD', '1')
- spice_server_has_smartcard = true
- spice_server_requires += 'libcacard >= 2.5.1 '
- endif
+smartcard_dep = dependency('libcacard', required : get_option('smartcard'), version : '>= 2.5.1')
+if smartcard_dep.found()
+ spice_server_deps += smartcard_dep
+ spice_server_config_data.set('USE_SMARTCARD', '1')
+ spice_server_has_smartcard = true
+ spice_server_requires += 'libcacard >= 2.5.1 '
endif
#
diff --git a/meson_options.txt b/meson_options.txt
index 49f59cc4..d19cacb2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -22,8 +22,7 @@ option('opus',
description: 'Enable Opus audio codec')
option('smartcard',
- type : 'boolean',
- value : true,
+ type : 'feature',
description : 'Enable smartcard support')
option('alignment-checks',
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 2e914f33..02530a80 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 2e914f3305f685c82143fa04067ce9f57fbfd602
+Subproject commit 02530a80dfa45c936215c47b8e3aa56720eb46b8
--
2.20.1
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel