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

[Christophe Fergeau]

Reviewed-by: Christophe Fergeau <cfergeau at redhat.com>

On Mon, Jan 07, 2019 at 12:00:50PM +0400, marcandre.lureau at redhat.com wrote:
> 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
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20190107/3dbe60e7/attachment.sig>