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.build | |
| 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.build')
| -rw-r--r-- | meson.build | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/meson.build b/meson.build index 44944d3162..cf0d8c9a30 100644 --- a/meson.build +++ b/meson.build @@ -347,32 +347,31 @@ config_h.set_quoted('NM_CONFIG_DEFAULT_LOGGING_BACKEND', config_logging_backend_ session_tracking = get_option('session_tracking') session_trackers = [] -enable_session_tracking = (session_tracking != 'no') -enable_consolekit = get_option('consolekit') - -if enable_session_tracking - if session_tracking == 'systemd' - logind_dep = libsystemd_dep - if not logind_dep.found() - logind_dep = dependency('libsystemd-login', required: false) - assert(logind_dep.found(), 'You must have libsystemd or libsystemd-login installed to build with systemd-logind support') - endif - session_trackers += 'systemd-logind' - config_h.set('SESSION_TRACKING_SYSTEMD', true) - else - logind_dep = libelogind_dep - assert(logind_dep.found() and libelogind_dep.version().version_compare('>= 229'), 'You must have libelogind installed to build with elogind support.') - session_trackers += 'elogind' - config_h.set('SESSION_TRACKING_ELOGIND', true) +if session_tracking == 'systemd' + logind_dep = libsystemd_dep + if not logind_dep.found() + logind_dep = dependency('libsystemd-login', required: false) + assert(logind_dep.found(), 'You must have libsystemd or libsystemd-login installed to build with systemd-logind support') endif + session_trackers += 'systemd-logind' + config_h.set10('SESSION_TRACKING_SYSTEMD', true) + config_h.set10('SESSION_TRACKING_ELOGIND', false) +elif session_tracking == 'elogind' + logind_dep = libelogind_dep + assert(logind_dep.found() and libelogind_dep.version().version_compare('>= 229'), 'You must have libelogind installed to build with elogind support.') + session_trackers += 'elogind' + config_h.set10('SESSION_TRACKING_SYSTEMD', false) + config_h.set10('SESSION_TRACKING_ELOGIND', true) +else + logind_dep = dependency('', required:false) +endif - if enable_consolekit - session_trackers += 'consolekit' - config_h.set_quoted('CKDB_PATH', '/var/run/ConsoleKit/database') - config_h.set('SESSION_TRACKING_CONSOLEKIT', enable_consolekit) - endif +session_tracking_consolekit = get_option('session_tracking_consolekit') +if session_tracking_consolekit + session_trackers += 'consolekit' endif +config_h.set10('SESSION_TRACKING_CONSOLEKIT', session_tracking_consolekit) hostname_persist = get_option('hostname_persist') config_h.set('HOSTNAME_PERSIST_SUSE', (hostname_persist == 'suse')) @@ -396,7 +395,7 @@ if enable_suspend_resume system_inhibit_dep = libelogind_dep suspend_resume = 'elogind' config_h.set('SUSPEND_RESUME_ELOGIND', true) - elif enable_consolekit + elif session_tracking_consolekit suspend_resume = 'consolekit' config_h.set('SUSPEND_RESUME_CONSOLEKIT', true) else |