[gnome-session] build: Rename build options

[Iñigo Martínez <inigomartinez src gnome org>]

commit 9c02bffc205a9ba37fffd2ba5c2da9b1f1383494
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Nov 16 17:43:58 2017 +0100

    build: Rename build options
    
    Following the new meson porting guidelines, this patch renames the
    build options as follows:
    
    - Remove the 'enable' prefix from boolean options.
    - The character separator in multi-word options has been changed
      to underscore.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=790486

 meson.build       |   16 ++++++++--------
 meson_options.txt |   16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/meson.build b/meson.build
index 17c1c75..02deddb 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,7 @@ check_symbols = [
 # compiler flags
 common_flags = ['-DHAVE_CONFIG_H']
 
-enable_deprecation_flags = get_option('enable-deprecation-flags')
+enable_deprecation_flags = get_option('deprecation_flags')
 if enable_deprecation_flags
   common_flags += [
     '-DBONOBO_DISABLE_DEPRECATED',
@@ -174,12 +174,12 @@ session_bin_deps = session_deps + [
   dependency('xext')
 ]
 
-enable_session_selector = get_option('enable-session-selector')
+enable_session_selector = get_option('session_selector')
 
 # Check for systemd
 session_tracking = 'null backend'
 
-enable_systemd = get_option('enable-systemd')
+enable_systemd = get_option('systemd')
 if enable_systemd
   libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
   session_bin_deps += libsystemd_dep
@@ -203,7 +203,7 @@ endif
 config_h.set('HAVE_SYSTEMD', enable_systemd)
 
 # Check for ConsoleKit
-enable_consolekit = get_option('enable-consolekit')
+enable_consolekit = get_option('consolekit')
 if enable_consolekit
   dbus_glib_dep = dependency('dbus-glib-1', version: '>= 0.76')
   assert(dbus_glib_dep.found(), 'ConsoleKit support explicitly required, but dbus-glib not found')
@@ -241,7 +241,7 @@ config_h.set('HAVE_XRENDER', have_xrender,
 
 # Check for X transport interface - allows to disable ICE Transports
 # See also https://bugzilla.gnome.org/show_bug.cgi?id=725100
-enable_xtrans = get_option('enable-xtrans')
+enable_xtrans = get_option('xtrans')
 have_xtrans = false
 
 if enable_xtrans
@@ -252,7 +252,7 @@ config_h.set10('HAVE_XTRANS', have_xtrans,
                description: 'Have the X Transport library')
 
 # Code for checking whether IPv6 is enabled on the system....
-enable_ipv6 = get_option('enable-ipv6')
+enable_ipv6 = get_option('ipv6')
 have_ipv6 = false
 
 if enable_ipv6
@@ -309,8 +309,8 @@ subdir('gnome-session')
 subdir('tools')
 subdir('data')
 
-enable_docbook = get_option('enable-docbook')
-enable_man = get_option('enable-man')
+enable_docbook = get_option('docbook')
+enable_man = get_option('man')
 if enable_docbook or enable_man
   subdir('doc')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 0e777ba..3a201f6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,8 +1,8 @@
-option('enable-deprecation-flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED 
flags')
-option('enable-session-selector', type: 'boolean', value: false, description: 'enable building a custom 
session selector dialog')
-option('enable-systemd', type: 'boolean', value: false, description: 'Use systemd')
-option('enable-consolekit', type: 'boolean', value: false, description: 'Use consolekit')
-option('enable-docbook', type: 'boolean', value: false, description: 'build documentation')
-option('enable-man', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
-option('enable-ipv6', type: 'boolean', value: false, description: 'enable IPv6 extensions')
-option('enable-xtrans', type: 'boolean', value: true, description: 'Build without xtrans support (results in 
ICE listening on remote TCP ports)')
+option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
+option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session 
selector dialog')
+option('systemd', type: 'boolean', value: false, description: 'Use systemd')
+option('consolekit', type: 'boolean', value: false, description: 'Use consolekit')
+option('docbook', type: 'boolean', value: false, description: 'build documentation')
+option('man', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+option('ipv6', type: 'boolean', value: false, description: 'enable IPv6 extensions')
+option('xtrans', type: 'boolean', value: true, description: 'Build without xtrans support (results in ICE 
listening on remote TCP ports)')