[gdm: 1/2] meson: Remove unused check-accelerated-dir option and references
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm: 1/2] meson: Remove unused check-accelerated-dir option and references
- Date: Wed, 24 Feb 2021 20:39:37 +0000 (UTC)
commit 4585abed659bff24aaecee44dbc0bb9dfde485f4
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Mon Dec 21 16:02:52 2020 +0100
meson: Remove unused check-accelerated-dir option and references
data/meson.build | 1 -
meson.build | 3 ---
meson_options.txt | 1 -
3 files changed, 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 05a201176..23e2d7f9f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -90,7 +90,6 @@ configure_file(
output: '@BASENAME@',
configuration: {
'libexecdir': gdm_prefix / get_option('libexecdir'),
- 'check_accelerated_dir': check_accelerated_dir,
'gnome_required_components': ';'.join(
[ gdm_gnome_shell_component ] + gdm_gnome_session_required_components),
},
diff --git a/meson.build b/meson.build
index 19f8fa9c1..1ab4ea29f 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,6 @@ dbus_sys_dir = (get_option('dbus-sys') != '')? get_option('dbus-sys') : get_opti
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'
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_runtime_conf = (get_option('runtime-conf') != '')? get_option('runtime-conf') : gdm_run_dir /
'custom.conf'
gdm_pid_file = (get_option('pid-file') != '')? get_option('pid-file') : gdm_run_dir / 'gdm.pid'
@@ -209,7 +208,6 @@ conf.set_quoted('GNOMELOCALEDIR', gdm_prefix / get_option('localedir'))
conf.set_quoted('AT_SPI_REGISTRYD_DIR', at_spi_registryd_dir)
conf.set_quoted('GDM_PID_FILE', gdm_pid_file)
conf.set_quoted('GNOME_SETTINGS_DAEMON_DIR', gnome_settings_daemon_dir)
-conf.set_quoted('CHECK_ACCELRATED_DIR', check_accelerated_dir)
conf.set_quoted('LANG_CONFIG_FILE', lang_config_file)
conf.set('HAVE_ADT', have_adt)
conf.set('HAVE_UTMP_H', have_utmp_header)
@@ -300,7 +298,6 @@ summary({
'GNOME locale': gdm_prefix / get_option('datadir') / get_option('localedir'),
'GNOME Settings Daemon': gnome_settings_daemon_dir,
'AT SPI registryd': at_spi_registryd_dir,
- 'Check Accelerated': check_accelerated_dir,
'Lang config file': lang_config_file,
'Pam MOD': pam_mod_dir,
'Udev rules': udev_dir,
diff --git a/meson_options.txt b/meson_options.txt
index 49550bc16..14e0b908b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,4 @@
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: '')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]