Acked-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
On Mon, Jan 07, 2019 at 12:00:48PM +0400, marcandre.lureau@xxxxxxxxxx wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> meson.build | 5 +++--
> meson_options.txt | 3 +--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 07e8227..4c9c05c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -263,8 +263,9 @@ endif
>
> # introspection
> spice_gtk_has_introspection = false
> -if get_option('introspection')
> - spice_glib_deps += dependency('gobject-introspection-1.0', version : '>= 0.94')
> +d = dependency('gobject-introspection-1.0', version : '>= 0.94', required : get_option('introspection'))
> +if d.found()
> + spice_glib_deps += d
> spice_gtk_has_introspection = true
> endif
>
> diff --git a/meson_options.txt b/meson_options.txt
> index 889c976..e92f931 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -44,8 +44,7 @@ option('coroutine',
> description : 'Use ucontext or GThread for coroutines')
>
> option('introspection',
> - type : 'boolean',
> - value : true,
> + type : 'feature',
> description: 'Check for GObject instrospection requirements')
>
> option('vapi',
> --
> 2.20.1.2.gb21ebb671b
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel