diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-10 07:31:16 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-10 12:27:33 +0100 |
| commit | 2ad6976cd48497a9fdbf3cd7c22f0ca6c5310995 (patch) | |
| tree | e54277ea8039b2dd11e14d2ed284753404a275c5 | |
| parent | ca9418232ca31ac1007bd762192ef1eb07707098 (diff) | |
| download | NetworkManager-2ad6976cd48497a9fdbf3cd7c22f0ca6c5310995.tar.gz | |
build/meson: fix build with -D session_tracking=no -D systemdsystemunitdir=no
The variable enable_consolekit is used below, outside the if.
We always must set it.
| -rw-r--r-- | meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 72b6141b36..6d29dfa3ee 100644 --- a/meson.build +++ b/meson.build @@ -402,6 +402,8 @@ 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 @@ -418,7 +420,6 @@ if enable_session_tracking config_h.set('SESSION_TRACKING_ELOGIND', true) endif - enable_consolekit = get_option('consolekit') if enable_consolekit session_trackers += 'consolekit' config_h.set_quoted('CKDB_PATH', '/var/run/ConsoleKit/database') |