From 2ad6976cd48497a9fdbf3cd7c22f0ca6c5310995 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 10 Jan 2018 07:31:16 +0100 Subject: [PATCH] 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. --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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')