[grilo/wip/jtojnar/meson-fixes: 2/3] build: Make meson options more idiomatic

[Victor Toso <victortoso src gnome org>]

commit 335bc779ceb29afa70c1c22c14e5700d09ba7bcf
Author: Jan Tojnar <jtojnar gmail com>
Date:   Mon Jan 7 16:36:23 2019 +0100

    build: Make meson options more idiomatic
    
    The vala option is renamed to vapi to make it compatible with recent Meson.

 doc/meson.build   |  2 +-
 meson.build       | 12 ++++++------
 meson_options.txt | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/doc/meson.build b/doc/meson.build
index 6872d8c..00ffb4a 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -7,6 +7,6 @@
 
 subdir('man')
 
-if get_option('enable-gtk-doc')
+if get_option('gtk_doc')
     subdir('grilo')
 endif
diff --git a/meson.build b/meson.build
index 7f237c6..295939c 100644
--- a/meson.build
+++ b/meson.build
@@ -46,27 +46,27 @@ gmodule_dep = dependency('gmodule-2.0', version: glib2_required_info, required:
 gobject_dep = dependency('gobject-2.0', version: glib2_required_info, required: true)
 libxml_dep = dependency('libxml-2.0', required: true)
 
-enable_grlnet = get_option('enable-grl-net')
+enable_grlnet = get_option('grl_net')
 if enable_grlnet
     libsoup_dep = dependency('libsoup-2.4', version: '>= 2.41.3', required: true)
 endif
 
-enable_grlpls = get_option('enable-grl-pls')
+enable_grlpls = get_option('grl_pls')
 if enable_grlpls
     totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required: true)
 endif
 
-enable_gir = get_option('enable-introspection') or get_option('enable-vala')
+enable_gir = get_option('introspection') or get_option('vapi')
 if enable_gir
-   find_program('g-ir-scanner', required: true)
+    find_program('g-ir-scanner', required: true)
 endif
 
-enable_vala = get_option('enable-vala')
+enable_vala = get_option('vapi')
 if enable_vala
     vapigen = find_program('vapigen', required: true)
 endif
 
-enable_testui = get_option('enable-test-ui')
+enable_testui = get_option('test_ui')
 if enable_testui
     gtk_dep = dependency('gtk+-3.0', version: '>= 3.14', required: true)
     oauth_dep = dependency('oauth', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index 5f396a1..d4800f1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,6 @@
-option('enable-grl-net', type: 'boolean', value: true, description: 'Enable Grilo Net library')
-option('enable-grl-pls', type: 'boolean', value: true, description: 'Enable Grilo Pls library')
-option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference')
-option('enable-introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection')
-option('enable-test-ui', type: 'boolean', value: true, description: 'Build Test UI')
-option('enable-vala', type: 'boolean', value: true, description: 'Enable Vala (enables GObject 
Introspection)')
+option('grl_net', type: 'boolean', value: true, description: 'Enable Grilo Net library')
+option('grl_pls', type: 'boolean', value: true, description: 'Enable Grilo Pls library')
+option('gtk_doc', type: 'boolean', value: false, description: 'Enable generating the API reference')
+option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection')
+option('test_ui', type: 'boolean', value: true, description: 'Build Test UI')
+option('vapi', type: 'boolean', value: true, description: 'Enable Vala (enables GObject Introspection)')