meson: switch to underscores in option nameswip/underscore-the-importance-of-consistency

Using dashes in option names is non-idiomatic for meson.

Tihs commit switches to the more conventional underscores as
a word delimiter.

5 files changed, 56 insertions, 56 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ea365a9..f8b0f2b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ build-fedora:
         yelp-tools
 
   script:
-    - meson . build --prefix=/usr --sysconfdir=/etc --localstatedir=/var --mandir=/usr/share/man --libdir=/usr/lib64 -Dpam-prefix=/etc -Drun-dir=/run/gdm -Dudev-dir=/lib/udev/rules.d -Ddefault-path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin -Dprofiling=true -Dplymouth=enabled -Dselinux=enabled
+    - meson . build --prefix=/usr --sysconfdir=/etc --localstatedir=/var --mandir=/usr/share/man --libdir=/usr/lib64 -Dpam_prefix=/etc -Drun_dir=/run/gdm -Dudev_dir=/lib/udev/rules.d -Ddefault_path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin -Dprofiling=true -Dplymouth=enabled -Dselinux=enabled
     - ninja -C build
     - ninja -C build install
     - ninja -C build dist
diff --git a/daemon/meson.build b/daemon/meson.build
index 72c7c3c1..24cb25f5 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -59,7 +59,7 @@ gdm_daemon_deps = [
   xcb_dep,
 ]
 
-if xdmcp_dep.found() and get_option('tcp-wrappers')
+if xdmcp_dep.found() and get_option('tcp_wrappers')
   gdm_daemon_deps += libwrap_dep
 endif
 
diff --git a/data/meson.build b/data/meson.build
index 02353422..ae40c1da 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -116,7 +116,7 @@ pam_data_files_map = {
 }
 
 pam_data_files = pam_data_files_map[default_pam_config]
-pam_prefix = (get_option('pam-prefix') != '')? get_option('pam-prefix') : get_option('sysconfdir')
+pam_prefix = (get_option('pam_prefix') != '')? get_option('pam_prefix') : get_option('sysconfdir')
 foreach _pam_filename : pam_data_files
   install_data('pam-@0@/@1@.pam'.format(default_pam_config, _pam_filename),
     rename: _pam_filename,
@@ -136,7 +136,7 @@ gdm_rules = configure_file(
 # DBus service files
 service_config = configuration_data()
 service_config.set('sbindir', gdm_prefix / get_option('sbindir'))
-service_config.set('GDM_INITIAL_VT', get_option('initial-vt'))
+service_config.set('GDM_INITIAL_VT', get_option('initial_vt'))
 service_config.set('LANG_CONFIG_FILE', lang_config_file)
 if plymouth_dep.found()
   service_config.set('PLYMOUTH_QUIT_SERVICE', 'plymouth-quit.service')
@@ -159,7 +159,7 @@ configure_file(
 )
 
 # XSession
-if get_option('gdm-xsession')
+if get_option('gdm_xsession')
   configure_file(
     input: 'XSession.in',
     output: '@BASENAME@',
diff --git a/meson.build b/meson.build
index 23d66f59..7ef1eccd 100644
--- a/meson.build
+++ b/meson.build
@@ -17,22 +17,22 @@ gdm_prefix = get_option('prefix')
 
 gdmconfdir = (get_option('sysconfsubdir') == '')? gdm_prefix / get_option('sysconfdir') : gdm_prefix / get_option('sysconfdir') / get_option('sysconfsubdir')
 dmconfdir = (get_option('dmconfdir') != '')? get_option('dmconfdir') : gdm_prefix / get_option('sysconfdir') / 'dm'
-udev_dir = get_option('udev-dir')
-at_spi_registryd_dir = (get_option('at-spi-registryd-dir') != '')? get_option('at-spi-registryd-dir') : gdm_prefix / get_option('libexecdir')
-lang_config_file = (get_option('lang-file') != '')? get_option('lang-file') : gdm_prefix / get_option('sysconfdir') / 'locale.conf'
-pam_mod_dir = (get_option('pam-mod-dir') != '')? get_option('pam-mod-dir') : gdm_prefix / get_option('libdir') / 'security'
-dbus_sys_dir = (get_option('dbus-sys') != '')? get_option('dbus-sys') : get_option('sysconfdir') / 'dbus-1' / 'system.d'
-gdm_defaults_conf = (get_option('defaults-conf') != '')? get_option('defaults-conf') : gdm_prefix / get_option('datadir') / 'gdm' / 'defaults.conf'
-gdm_custom_conf = (get_option('custom-conf') != '')? get_option('custom-conf') : gdmconfdir / 'custom.conf'
-gdm_runtime_conf = (get_option('runtime-conf') != '')? get_option('runtime-conf') : gdm_custom_conf
-gnome_settings_daemon_dir = (get_option('gnome-settings-daemon-dir') != '')? get_option('gnome-settings-daemon-dir') : gdm_prefix / get_option('libexecdir')
-check_accelerated_dir = (get_option('check-accelerated-dir') != '')? get_option('check-accelerated-dir') : gdm_prefix / get_option('libexecdir')
-gdm_run_dir = (get_option('run-dir') != '')? get_option('run-dir') : gdm_prefix / get_option('localstatedir') / 'run' / 'gdm'
-gdm_pid_file = (get_option('pid-file') != '')? get_option('pid-file') : gdm_run_dir / 'gdm.pid'
-ran_once_marker_dir = (get_option('ran-once-marker-dir') != '')? get_option('ran-once-marker-dir') : gdm_run_dir
-working_dir = (get_option('working-dir') != '')? get_option('working-dir') : gdm_prefix / get_option('localstatedir') / 'lib' / 'gdm'
-gdm_xauth_dir = (get_option('xauth-dir') != '')? get_option('xauth-dir') : gdm_run_dir
-gdm_screenshot_dir = (get_option('screenshot-dir') != '')? get_option('screenshot-dir') : gdm_run_dir / 'greeter'
+udev_dir = get_option('udev_dir')
+at_spi_registryd_dir = (get_option('at_spi_registryd_dir') != '')? get_option('at_spi_registryd_dir') : gdm_prefix / get_option('libexecdir')
+lang_config_file = (get_option('lang_file') != '')? get_option('lang_file') : gdm_prefix / get_option('sysconfdir') / 'locale.conf'
+pam_mod_dir = (get_option('pam_mod_dir') != '')? get_option('pam_mod_dir') : gdm_prefix / get_option('libdir') / 'security'
+dbus_sys_dir = (get_option('dbus_sys') != '')? get_option('dbus_sys') : get_option('sysconfdir') / 'dbus-1' / 'system.d'
+gdm_defaults_conf = (get_option('defaults_conf') != '')? get_option('defaults_conf') : gdm_prefix / get_option('datadir') / 'gdm' / 'defaults.conf'
+gdm_custom_conf = (get_option('custom_conf') != '')? get_option('custom_conf') : gdmconfdir / 'custom.conf'
+gdm_runtime_conf = (get_option('runtime_conf') != '')? get_option('runtime_conf') : gdm_custom_conf
+gnome_settings_daemon_dir = (get_option('gnome_settings_daemon_dir') != '')? get_option('gnome_settings_daemon_dir') : gdm_prefix / get_option('libexecdir')
+check_accelerated_dir = (get_option('check_accelerated_dir') != '')? get_option('check_accelerated_dir') : gdm_prefix / get_option('libexecdir')
+gdm_run_dir = (get_option('run_dir') != '')? get_option('run_dir') : gdm_prefix / get_option('localstatedir') / 'run' / 'gdm'
+gdm_pid_file = (get_option('pid_file') != '')? get_option('pid_file') : gdm_run_dir / 'gdm.pid'
+ran_once_marker_dir = (get_option('ran_once_marker_dir') != '')? get_option('ran_once_marker_dir') : gdm_run_dir
+working_dir = (get_option('working_dir') != '')? get_option('working_dir') : gdm_prefix / get_option('localstatedir') / 'lib' / 'gdm'
+gdm_xauth_dir = (get_option('xauth_dir') != '')? get_option('xauth_dir') : gdm_run_dir
+gdm_screenshot_dir = (get_option('screenshot_dir') != '')? get_option('screenshot_dir') : gdm_run_dir / 'greeter'
 
 # Common variables
 config_h_dir = include_directories('.')
@@ -89,13 +89,13 @@ else
   x_bin = '/usr/bin/X'
 endif
 xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
-if xdmcp_dep.found() and get_option('tcp-wrappers')
+if xdmcp_dep.found() and get_option('tcp_wrappers')
   libwrap_dep = cc.find_library('libwrap')
 endif
 # systemd
 systemd_dep = dependency('systemd')
 libsystemd_dep = dependency('libsystemd')
-journald_dep = dependency('journald', required: get_option('systemd-journal'))
+journald_dep = dependency('journald', required: get_option('systemd_journal'))
 systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
 systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
 # Plymouth
@@ -153,7 +153,7 @@ int main(int argc, char **argv) {
 libpam_dep = cc.find_library('pam')
 pam_extensions_supported = cc.has_header_symbol('security/pam_appl.h', 'PAM_BINARY_PROMPT')
 
-default_pam_config = get_option('default-pam-config')
+default_pam_config = get_option('default_pam_config')
 # If requested, try autodetecting from release files (see NetworkManager source) 
 if default_pam_config == 'autodetect'
   pam_autodetect_map = {
@@ -188,7 +188,7 @@ conf.set_quoted('SYSCONFDIR', gdm_prefix / get_option('sysconfdir'))
 conf.set_quoted('BINDIR', gdm_prefix / get_option('bindir'))
 conf.set_quoted('LIBDIR', gdm_prefix / get_option('libdir'))
 conf.set_quoted('LIBEXECDIR', gdm_prefix / get_option('libexecdir'))
-conf.set_quoted('LOGDIR', get_option('log-dir'))
+conf.set_quoted('LOGDIR', get_option('log_dir'))
 conf.set_quoted('DMCONFDIR', dmconfdir)
 conf.set_quoted('GDMCONFDIR', gdmconfdir)
 conf.set_quoted('GDM_SCREENSHOT_DIR', gdm_screenshot_dir)
@@ -216,15 +216,15 @@ conf.set('HAVE_PAM_SYSLOG', have_pam_syslog)
 conf.set('HAVE_KEYUTILS', keyutils_dep.found())
 conf.set('SUPPORTS_PAM_EXTENSIONS', pam_extensions_supported)
 conf.set('HAVE_SELINUX', libselinux_dep.found())
-conf.set('ENABLE_USER_DISPLAY_SERVER', get_option('user-display-server'))
+conf.set('ENABLE_USER_DISPLAY_SERVER', get_option('user_display_server'))
 conf.set('ENABLE_SYSTEMD_JOURNAL', journald_dep.found())
-conf.set('ENABLE_WAYLAND_SUPPORT', get_option('wayland-support'))
+conf.set('ENABLE_WAYLAND_SUPPORT', get_option('wayland_support'))
 conf.set('ENABLE_PROFILING', get_option('profiling'))
-conf.set('GDM_INITIAL_VT', get_option('initial-vt'))
+conf.set('GDM_INITIAL_VT', get_option('initial_vt'))
 conf.set_quoted('GDM_DEFAULTS_CONF', gdm_defaults_conf)
 conf.set_quoted('GDM_CUSTOM_CONF', gdm_custom_conf)
 conf.set_quoted('GDM_RUNTIME_CONF', gdm_runtime_conf)
-conf.set_quoted('GDM_SESSION_DEFAULT_PATH', get_option('default-path'))
+conf.set_quoted('GDM_SESSION_DEFAULT_PATH', get_option('default_path'))
 conf.set_quoted('GDM_USERNAME', get_option('user'))
 conf.set_quoted('GDM_GROUPNAME', get_option('group'))
 conf.set('HAVE_LIBXDMCP', xdmcp_dep.found())
diff --git a/meson_options.txt b/meson_options.txt
index 2de7ca52..72571f2e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,39 +1,39 @@
-option('at-spi-registryd-dir', type: 'string', value: '', description: 'Specify the directory of at-spi-registryd.')
-option('check-accelerated-dir', type: 'string', value: '', description: 'Specify the directory of gnome-session-check-accelerated.')
-option('custom-conf', type: 'string', value: '', description: 'Filename to give to custom configuration file.')
-option('dbus-sys', type: 'string', value: '', description: 'Where D-Bus systemd directory is.')
-option('default-pam-config', type: 'combo', choices: [ 'autodetect', 'redhat', 'openembedded', 'exherbo', 'lfs', 'arch', 'none'], value: 'autodetect', description: '')
-option('default-path', type: 'string', value: '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin', description: 'Path GDM will use as the user\'s default PATH.')
-option('defaults-conf', type: 'string', value: '', description: 'Filename to give to defaults file.')
+option('at_spi_registryd_dir', type: 'string', value: '', description: 'Specify the directory of at_spi_registryd.')
+option('check_accelerated_dir', type: 'string', value: '', description: 'Specify the directory of gnome_session_check_accelerated.')
+option('custom_conf', type: 'string', value: '', description: 'Filename to give to custom configuration file.')
+option('dbus_sys', type: 'string', value: '', description: 'Where D_Bus systemd directory is.')
+option('default_pam_config', type: 'combo', choices: [ 'autodetect', 'redhat', 'openembedded', 'exherbo', 'lfs', 'arch', 'none'], value: 'autodetect', description: '')
+option('default_path', type: 'string', value: '/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin', description: 'Path GDM will use as the user\'s default PATH.')
+option('defaults_conf', type: 'string', value: '', description: 'Filename to give to defaults file.')
 option('dmconfdir', type: 'string', value: '', description: 'Directory where sessions are stored.')
-option('gdm-xsession', type: 'boolean', value: false, description: 'Enable installing the gdm Xsession file.')
-option('gnome-settings-daemon-dir', type: 'string', value: '', description: 'Specify the directory of gnome-settings-daemon used by the chooser.')
+option('gdm_xsession', type: 'boolean', value: false, description: 'Enable installing the gdm Xsession file.')
+option('gnome_settings_daemon_dir', type: 'string', value: '', description: 'Specify the directory of gnome_settings_daemon used by the chooser.')
 option('group', type: 'string', value: 'gdm', description: 'GDM\'s group.')
-option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual terminal to use.')
+option('initial_vt', type: 'integer', value: 1, description: 'Initial virtual terminal to use.')
 option('ipv6', type: 'boolean', value: false, description: 'Enables compilation of IPv6 code.')
-option('lang-file', type: 'string', value: '', description: 'File containing default language settings.')
+option('lang_file', type: 'string', value: '', description: 'File containing default language settings.')
 option('libaudit', type: 'feature', value: 'auto', description: 'Add Linux audit support.')
-option('log-dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.')
-option('pam-mod-dir', type: 'string', value: '', description: 'Directory to install PAM modules in.')
-option('pam-prefix', type: 'string', value: '', description: 'Specify where PAM files go.')
-option('pid-file', type: 'string', value: '', description: 'Pid file.')
+option('log_dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.')
+option('pam_mod_dir', type: 'string', value: '', description: 'Directory to install PAM modules in.')
+option('pam_prefix', type: 'string', value: '', description: 'Specify where PAM files go.')
+option('pid_file', type: 'string', value: '', description: 'Pid file.')
 option('plymouth', type: 'feature', value: 'auto', description: 'Add plymouth support.')
 option('profiling', type: 'boolean', value: false, description: 'Enable profiling.')
-option('ran-once-marker-dir', type: 'string', value: '', description: 'Ran once marker directory.')
-option('run-dir', type: 'string', value: '', description: 'Runtime directory.')
-option('runtime-conf', type: 'string', value: '', description: 'Filename to give to runtime configuration file.')
-option('screenshot-dir', type: 'string', value: '', description: 'Directory to store greeter screenshot.')
+option('ran_once_marker_dir', type: 'string', value: '', description: 'Ran once marker directory.')
+option('run_dir', type: 'string', value: '', description: 'Runtime directory.')
+option('runtime_conf', type: 'string', value: '', description: 'Filename to give to runtime configuration file.')
+option('screenshot_dir', type: 'string', value: '', description: 'Directory to store greeter screenshot.')
 option('selinux', type: 'feature', value: 'auto', description: 'Add SELinux support.')
 option('solaris', type: 'boolean', value: false, description: 'Build for Solaris')
-option('split-authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.')
+option('split_authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.')
 option('sysconfsubdir', type: 'string', value: 'gdm', description: 'Directory name used under sysconfdir.')
-option('systemd-journal', type: 'boolean', value: false, description: 'Add journald support.')
+option('systemd_journal', type: 'boolean', value: false, description: 'Add journald support.')
 option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files.')
-option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
-option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.')
+option('tcp_wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
+option('udev_dir', type: 'string', value: '', description: 'Directory for udev rules file.')
 option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
-option('user-display-server', type: 'boolean', value: true, description: 'Enable running X server as user.')
-option('wayland-support', type: 'boolean', value: true, description: 'Enable support for wayland sessions.')
-option('working-dir', type: 'string', value: '', description: 'Working directory.')
-option('xauth-dir', type: 'string', value: '', description: 'XAuth cookie directory.')
+option('user_display_server', type: 'boolean', value: true, description: 'Enable running X server as user.')
+option('wayland_support', type: 'boolean', value: true, description: 'Enable support for wayland sessions.')
+option('working_dir', type: 'string', value: '', description: 'Working directory.')
+option('xauth_dir', type: 'string', value: '', description: 'XAuth cookie directory.')
 option('xdmcp', type: 'feature', value: 'auto', description: 'Add XDMCP (remote login) support.')