diff options
| author | Marius Bakke <marius.bakke@usit.uio.no> | 2022-09-04 23:10:37 +0200 |
|---|---|---|
| committer | Jan Rybar <jrybar@redhat.com> | 2023-02-07 17:51:07 +0000 |
| commit | 31309f18a398152ca86d7f3eea52a605e77d3df9 (patch) | |
| tree | 2d27e03da0b61adfe26632a2a6524913ea998640 | |
| parent | 7352e36f8e4d97544f6536357cc1d4605270a303 (diff) | |
| download | polkit-31309f18a398152ca86d7f3eea52a605e77d3df9.tar.gz | |
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.
| -rw-r--r-- | data/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
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') |