PolicyKit: Branch 'master'

[GitLab Mirror]

 data/meson.build |    2 +-
 meson.build      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31309f18a398152ca86d7f3eea52a605e77d3df9
Author: Marius Bakke <marius.bakke at usit.uio.no>
Date:   Sun Sep 4 23:10:37 2022 +0200

    build: libelogind session tracking does not require systemd.
    
    * meson.build (enable_logind): Permit empty systemd_systemdsystemunitdir
    when session_tracking != 'libsystemd-login'.
    * data/meson.build (service_conf): Test for SESSION_TRACKING ==
    'libsystemd-login' instead of ENABLE_LOGIND when installing service files.

diff --git a/data/meson.build b/data/meson.build
index 5889495..27ab76a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,7 +26,7 @@ if enable_pam
   )
 endif
 
-if enable_logind
+if session_tracking == 'libsystemd-login'
   configure_file(
     input: 'polkit.service.in',
     output: '@BASENAME@',
diff --git a/meson.build b/meson.build
index ba8f5b0..876b55e 100644
--- a/meson.build
+++ b/meson.build
@@ -204,7 +204,7 @@ if enable_logind
 
   # systemd unit / service files
   systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
-  if systemd_systemdsystemunitdir == ''
+  if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
     systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
     # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
     systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')