[gnome-shell/benzea/systemd-3.36-units: 430/432] meson: Use systemd.pc for path resolution

[Benjamin Berg <bberg src gnome org>]

commit eb271b1b832d2e1c2022a283b5f918bb1a62ce35
Author: Benjamin Berg <bberg redhat com>
Date:   Wed Dec 11 22:23:43 2019 +0100

    meson: Use systemd.pc for path resolution
    
    This requires systemd verseion 242 which has been released long enough
    at this point.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895

 meson.build | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/meson.build b/meson.build
index c7c2d71791..533bc85493 100644
--- a/meson.build
+++ b/meson.build
@@ -31,6 +31,7 @@ schemas_req = '>= 3.33.1'
 startup_req = '>= 0.11'
 ibus_req = '>= 1.5.2'
 gnome_desktop_req = '>= 3.34.2'
+systemd_req = '>= 242'
 
 bt_req = '>= 3.9.0'
 gst_req = '>= 0.11.92'
@@ -62,13 +63,6 @@ portaldir = join_paths(datadir, 'xdg-desktop-portal', 'portals')
 schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 servicedir = join_paths(datadir, 'dbus-1', 'services')
 
-# 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',
-#                                                         define_variable: ['prefix', prefix])
-# and uncomment systemd_dep below
-systemduserunitdir = join_paths(prefix, 'lib', 'systemd', 'user')
-
 keybindings_dep = dependency('gnome-keybindings', required: false)
 if keybindings_dep.found()
   keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
@@ -125,9 +119,11 @@ endif
 
 if get_option('systemd')
   libsystemd_dep = dependency('libsystemd')
-  # XXX: see systemduserunitdir
-  # systemd_dep = dependency('systemd')
+  systemd_dep = dependency('systemd', version: systemd_req)
   have_systemd = true
+
+  systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
+                                                          define_variable: ['prefix', prefix])
 else
   libsystemd_dep = []
   have_systemd = false