[libsoup/wip/meson] Update the Meson options names

[Tomas Popela <tpopela src gnome org>]

commit ad3ff7562b41f7fbd62c90fb8458af269103676e
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Nov 27 12:24:46 2017 +0100

    Update the Meson options names
    
    Per https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting

 libsoup/meson.build |    6 +++---
 meson.build         |   16 ++++++++--------
 meson_options.txt   |   20 ++++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 5cf056a..0547d04 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -216,7 +216,7 @@ if cdata.get('BUILD_LIBSOUP_GNOME')
     dependencies : [deps, libsoup_dep])
 endif
 
-if get_option('enable-introspection') or get_option('enable-vala')
+if get_option('introspection') or get_option('vapi')
   soup_introspection_sources = [
     'soup-address.c',
     'soup-address.h',
@@ -365,7 +365,7 @@ if get_option('enable-introspection') or get_option('enable-vala')
     dependencies : deps,
     sources : soup_gir_gen_sources)
 
-  if get_option('enable-vala')
+  if get_option('vapi')
     gnome.generate_vapi('libsoup-2.4',
       sources : [soup_gir_gen_sources[0][0]],
       packages : ['gio-2.0'],
@@ -373,7 +373,7 @@ if get_option('enable-introspection') or get_option('enable-vala')
     )
   endif
 
-  if get_option('enable-gnome')
+  if get_option('gnome')
     gir_gnome_args = libsoup_c_args + [
       '--identifier-prefix=Soup',
       '--symbol-prefix=soup',
diff --git a/meson.build b/meson.build
index 8157ec4..c9f2191 100644
--- a/meson.build
+++ b/meson.build
@@ -46,7 +46,7 @@ int main(void) {
 }
 '''
 
-enable_tls_check = get_option('enable-tls-check')
+enable_tls_check = get_option('tls_check')
 if enable_tls_check
   if not cc.compiles(check_glib_networking_src, name : 'glib-networking supports TLS', dependencies : 
glib_dep)
     error('libsoup requires glib-networking for TLS support')
@@ -115,8 +115,8 @@ endif
 ##################
 # GSSAPI support #
 ##################
-enable_gssapi = get_option('enable-gssapi')
-krb5_config_option = get_option('krb5-config')
+enable_gssapi = get_option('gssapi')
+krb5_config_option = get_option('krb5_config')
 if enable_gssapi
   krb5_config_path = krb5_config_option != '' ? krb5_config_option : 'krb5-config'
   krb5_config = find_program(krb5_config_path, required : false)
@@ -152,9 +152,9 @@ endif
 ################
 # NTLM not supported on Windows
 if host_machine.system() != 'windows'
-  enable_ntlm = get_option('enable-ntlm')
+  enable_ntlm = get_option('ntlm')
   if enable_ntlm
-    ntlm_auth_option = get_option('ntlm-auth')
+    ntlm_auth_option = get_option('ntlm_auth')
     ntlm_auth_path = ntlm_auth_option != '' ? ntlm_auth_option : 'ntlm_auth'
     ntlm_auth = find_program(ntlm_auth_path, required : false)
 
@@ -168,7 +168,7 @@ endif
 #################
 # GNOME support #
 #################
-enable_gnome = get_option('enable-gnome')
+enable_gnome = get_option('gnome')
 if host_machine.system() == 'windows'
   enable_gnome = false
 endif
@@ -209,10 +209,10 @@ subdir('libsoup')
 subdir('po')
 subdir('examples')
 
-if get_option('enable-tests')
+if get_option('tests')
   subdir('tests')
  endif
 
-if get_option('enable-gtk-doc')
+if get_option('doc')
   subdir('docs/reference')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index b062706..1819953 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,58 +1,58 @@
-option('enable-gssapi',
+option('gssapi',
   type : 'boolean',
   value : true,
   description : 'Build with GSSAPI support'
 )
 
-option('krb5-config',
+option('krb5_config',
   type : 'string',
   value : '',
   description : 'Where to look for krb5-config, path points to krb5-config installation (defaultly looking 
in PATH)'
 )
 
-option('enable-ntlm',
+option('ntlm',
   type : 'boolean',
   value : false,
   description : 'Build with NTLM support'
 )
 
-option('ntlm-auth',
+option('ntlm_auth',
   type : 'string',
   value : '',
   description : 'Where to look for ntlm_auth, path points to ntlm_auth installation (defaultly looking in 
PATH)'
 )
 
-option('enable-tls-check',
+option('tls_check',
   type : 'boolean',
   value : true,
   description : 'Enable TLS support through glib-networking. If you are building a package, you can disable 
this to allow building libsoup anyway (since glib-networking is not actually required at compile time), but 
you should be sure to add a runtime dependency on it.'
 )
 
-option('enable-gnome',
+option('gnome',
   type : 'boolean',
   value : true,
   description : 'Build libsoup with GNOME support'
 )
 
-option('enable-introspection',
+option('introspection',
   type : 'boolean',
   value : true,
   description : 'Build GObject Introspection data'
 )
 
-option('enable-vala',
+option('vapi',
   type : 'boolean',
   value : false,
   description : 'Build Vala bindings'
 )
 
-option('enable-gtk-doc',
+option('doc',
   type: 'boolean',
   value: false,
   description: 'Enable generating the API reference'
 )
 
-option('enable-tests',
+option('tests',
   type: 'boolean',
   value: true,
   description: 'Enable unit tests compilation'