[gnome-initial-setup/wjt/ci-fedora-31: 12/13] Revert "meson: Query systemd unit dir using pkg-config"



commit 06b2a5a7bea5c94711b41e980552efa47e736841
Author: Will Thompson <will willthompson co uk>
Date:   Fri Jan 17 17:10:39 2020 +0000

    Revert "meson: Query systemd unit dir using pkg-config"
    
    This reverts commit c135b5efebe990fbef503c4fde3a607fd98b5914.

 meson.build | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 1f99918..9af4cee 100644
--- a/meson.build
+++ b/meson.build
@@ -32,11 +32,14 @@ conf.set_quoted('G_LOG_DOMAIN', 'InitialSetup')
 
 enable_systemd = get_option('systemd')
 if enable_systemd
-    systemd_dep = dependency('systemd', version: '>= 242', required: false)
+    systemd_dep = dependency('systemd', required: false)
     assert(systemd_dep.found(), 'Systemd support explicitly required, but systemd not found')
 
-    systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-                                                             define_variable: ['prefix', prefix])
+    # 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')
 endif
 
 # Needed for the 'account' page


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]