diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-08-26 20:14:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-08-27 17:49:29 +0200 |
| commit | 1a9bc22460c5bde4ba169b0cc4732971de309720 (patch) | |
| tree | 943c28ba1f2c8f90841df303aed06dbdcd61ee28 /meson_options.txt | |
| parent | 3b5f8c91fe0e5a3d04a5ba10a651fc6817119a19 (diff) | |
| download | NetworkManager-1a9bc22460c5bde4ba169b0cc4732971de309720.tar.gz | |
build: cleanup build defines for session-tracking
- always define the SESSION_TRACKING_* defines to replace
"#ifdef" with "#if".
- drop defining the consolekit database path CKDB_PATH in
config.h. The path was not customizable via configure/meson.
- fix meson build to enable consolekit support for session tracking
without also enabling logind/elogind session tracking.
logind/elogind is mutually exclusive, but consolekit session tracking
goes together just fine.
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt index e97a773ac6..61304fcc04 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -13,7 +13,7 @@ option('dnssec_trigger', type: 'array', value: ['dnssec-trigger-script', '/usr/l # platform option('dist_version', type: 'string', value: '', description: 'Define the NM\'s distribution version string') -option('consolekit', type: 'boolean', value: true, description: 'Support consolekit session tracking') +option('session_tracking_consolekit', type: 'boolean', value: true, description: 'Support consolekit session tracking') option('session_tracking', type: 'combo', choices: ['systemd', 'elogind', 'no'], value: 'systemd', description: 'Compatibility option to choose one session tracking module') option('suspend_resume', type: 'boolean', value: true, description: 'Build NetworkManager with specific suspend/resume support') option('polkit', type: 'combo', choices: ['yes', 'no', 'disabled'], value: 'yes', description: 'set default value for auth-polkit configuration option. This value can be overwritten by NM configuration. \'disabled\' compiles NM without any support') |