[Spice-devel] [PATCH spice-server 2/2] meson: switch smartcard option to auto feature

[Eduardo Lima (Etrunko)]

Make it compatible with spice-common.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
 meson.build       | 14 ++++++--------
 meson_options.txt |  3 +--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index f6580fc2..ec1518ec 100644
--- a/meson.build
+++ b/meson.build
@@ -168,14 +168,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',
-- 
2.20.1