[Spice-devel] [PATCH spice-gtk 21/34] meson: switch sasl option to auto feature

[marcandre.lureau at redhat.com]

From: Marc-André Lureau <marcandre.lureau at redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 .gitlab-ci.yml    | 1 -
 meson.build       | 5 +++--
 meson_options.txt | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 692374a..a3cb6ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,6 @@ makecheck_simple:
 makecheck_simple-meson:
   script:
   - meson build -Dauto_features=disabled
-                -Dsasl=false
                 -Dsmartcard=false
                 -Ddbus=false || (cat build/meson-logs/meson-log.txt && exit 1)
   - ninja -C build
diff --git a/meson.build b/meson.build
index a5d584d..d2df33e 100644
--- a/meson.build
+++ b/meson.build
@@ -296,8 +296,9 @@ endif
 
 # sasl
 spice_gtk_has_sasl = false
-if get_option('sasl')
-  spice_glib_deps += dependency('libsasl2')
+d = dependency('libsasl2', required : get_option('sasl'))
+if d.found()
+  spice_glib_deps += d
   spice_gtk_config_data.set('HAVE_SASL', '1')
   spice_gtk_has_sasl = true
 endif
diff --git a/meson_options.txt b/meson_options.txt
index abd0b0f..a16fe49 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -67,8 +67,7 @@ option('lz4',
     description: 'Enable lz4 compression support')
 
 option('sasl',
-    type : 'boolean',
-    value : true,
+    type : 'feature',
     description : 'Use cyrus SASL authentication')
 
 option('celt051',
-- 
2.20.1.2.gb21ebb671b