[gnome-initial-setup/benzea/systemd-3-36: 130/134] meson: Query systemd unit dir using pkg-config
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/benzea/systemd-3-36: 130/134] meson: Query systemd unit dir using pkg-config
- Date: Mon, 13 Jul 2020 15:13:20 +0000 (UTC)
commit 41146132d031ae1b9a550e1db4009038b39cab4d
Author: Benjamin Berg <bberg redhat com>
Date: Sat Dec 14 10:16:37 2019 +0100
meson: Query systemd unit dir using pkg-config
meson.build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 66eab167..b83179b1 100644
--- a/meson.build
+++ b/meson.build
@@ -40,14 +40,11 @@ conf.set('GIS_MICRO_VERSION', micro_version)
enable_systemd = get_option('systemd')
if enable_systemd
- systemd_dep = dependency('systemd', required: false)
+ systemd_dep = dependency('systemd', version: '>= 242', required: false)
assert(systemd_dep.found(), 'Systemd support explicitly required, but systemd not found')
- # XXX: Once https://github.com/systemd/systemd/issues/9595 is fixed and we can
- # depend on this version, replace with something like:
- # systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
- # and uncomment systemd_dep below
- systemd_userunitdir = join_paths(prefix, 'lib', 'systemd', 'user')
+ systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
+ define_variable: ['prefix', prefix])
endif
vendor_conf_file = get_option('vendor-conf-file')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]