From 327f1eee192a742a92e57345d25eda85cce630e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= <inigomartinez@gmail.com>
Date: Mon, 6 Nov 2017 19:40:59 +0100
Subject: build: Make SystemdService entry conditional

When systemd user units installation is disabled, SystemdService
entry should also not be present on D-Bus service files.

This patch adds a common D-Bus service file template allowing,
an homogeneus D-Bus service file generation and also a
SystemService entry conditioned to the systemd user units
installation option.

https://bugzilla.gnome.org/show_bug.cgi?id=786149
---
 metadata/meson.build | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'metadata')

diff --git a/metadata/meson.build b/metadata/meson.build
index a4f939a5..e1625b80 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -1,12 +1,6 @@
-service = gvfs_namespace + '.Metadata.service'
-
-metadata_service = configure_file(
-  input: service + '.in',
-  output: service,
-  install: true,
-  install_dir: dbus_service_dir,
-  configuration: service_conf
-)
+dbus_service = gvfs_namespace + '.Metadata'
+dbus_exec = 'gvfsd-metadata'
+dbus_systemd_service = ''
 
 if install_systemd_user_unit_dir
   service = 'gvfs-metadata.service'
@@ -18,8 +12,23 @@ if install_systemd_user_unit_dir
     install_dir: systemd_user_unit_dir,
     configuration: service_conf
   )
+
+  dbus_systemd_service = 'SystemdService=' + service
 endif
 
+dbus_service_conf = configuration_data()
+dbus_service_conf.set('service', dbus_service)
+dbus_service_conf.set('exec', join_paths(gvfs_libexecdir, dbus_exec))
+dbus_service_conf.set('systemd_service', dbus_systemd_service)
+
+metadata_service = configure_file(
+  input: dbus_service_in,
+  output: dbus_service + '.service',
+  install: true,
+  install_dir: dbus_service_dir,
+  configuration: dbus_service_conf
+)
+
 metadata_dbus = gnome.gdbus_codegen(
   'metadata-dbus',
   'dbus-interface.xml',
-- 
cgit v1.2.1