| 1 | Don't install systemd units unless using libsystemd session tracking.
|
| 2 |
|
| 3 | Submitted upstream:
|
| 4 |
|
| 5 | https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/134
|
| 6 |
|
| 7 | diff --git a/data/meson.build b/data/meson.build
|
| 8 | |
| 9 | |
| 10 | @@ -26,7 +26,7 @@ if enable_pam
|
| 11 | )
|
| 12 | endif
|
| 13 |
|
| 14 | -if enable_logind
|
| 15 | +if session_tracking == 'libsystemd-login'
|
| 16 | configure_file(
|
| 17 | input: 'polkit.service.in',
|
| 18 | output: '@BASENAME@',
|
| 19 | diff --git a/meson.build b/meson.build
|
| 20 | |
| 21 | |
| 22 | @@ -199,7 +199,7 @@ if enable_logind
|
| 23 |
|
| 24 | # systemd unit / service files
|
| 25 | systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
|
| 26 | - if systemd_systemdsystemunitdir == ''
|
| 27 | + if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
|
| 28 | systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
| 29 | # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
|
| 30 | systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|