[Spice-commits] .gitlab-ci.yml meson.build meson_options.txt

[GitLab Mirror]

 .gitlab-ci.yml    |    1 -
 meson.build       |    5 +++--
 meson_options.txt |    3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit dbdf692909f7a2b272b06a674a38a1aeb4303032
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Fri Jan 4 20:16:53 2019 +0400

    build-sys: switch smartcard option to auto feature
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
    Reviewed-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcaebbf..fd999d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,6 @@ makecheck_simple-meson:
   - meson build -Dauto_features=disabled
                 -Dgstaudio=false
                 -Dgstvideo=false
-                -Dsmartcard=false
                 -Dusbredir=false
                 -Ddbus=false || (cat build/meson-logs/meson-log.txt && exit 1)
   - ninja -C build
diff --git a/meson.build b/meson.build
index 7daea8f..3737768 100644
--- a/meson.build
+++ b/meson.build
@@ -336,8 +336,9 @@ endif
 
 # smartcard check
 spice_gtk_has_smartcard = false
-if get_option('smartcard')
-  spice_glib_deps += dependency('libcacard', version : '>= 2.5.1')
+d = dependency('libcacard', version : '>= 2.5.1', required : get_option('smartcard'))
+if d.found()
+  spice_glib_deps += d
   spice_gtk_config_data.set('USE_SMARTCARD', '1')
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 5d48a2c..32468b7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -91,8 +91,7 @@ option('opus',
     description: 'Enable Opus audio codec')
 
 option('smartcard',
-    type : 'boolean',
-    value : true,
+    type : 'feature',
     description : 'Enable smartcard support')
 
 option('gtk_doc',