[Spice-devel] [PATCH spice-gtk 28/34] meson: switch vapi to auto feature

[Christophe Fergeau]

On Mon, Jan 07, 2019 at 12:00:57PM +0400, marcandre.lureau at redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
> 
> Removed unused vapigen/vapidir variables as well.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
> ---
>  meson.build       | 9 +++++----
>  meson_options.txt | 3 +--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 9896151..7e0c68d 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -279,10 +279,11 @@ endif
>  
>  # vala (depends on introspection)
>  spice_gtk_has_vala = false
> -if spice_gtk_has_introspection and get_option('vapi')
> -  vapigen_dep = dependency('vapigen')
> -  vapidir = vapigen_dep.get_pkgconfig_variable('vapidir')
> -  vapigen = dependency('vapigen').get_pkgconfig_variable('vapigen')
> +d = dependency('vapigen', required : get_option('vapi'))
> +if d.found()
> +  if not spice_gtk_has_introspection
> +    error('VAPI support requested without introspection')
> +  endif

I'd be a bit more sophisticated here in order to handle 'auto', maybe
something like this:

if not spice_gtk_has_introspection:
    if get_option('vapi').enabled()
        error('VAPI support requested without introspection')
    endif
    spice_gtk_has_vala = false
endif
spice_gtk_has_vala = true


Christophe
-------------- 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/7760cecb/attachment-0001.sig>