1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From 2c6c3adc1871735f72eb48bda3fdf600d79b6d0a Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 6 Oct 2017 11:53:45 +0200
Subject: [PATCH 1/2] Make systemd optional. If systemd is not available at
build-time, the creation of the .service file is omitted.
---
configure.ac | 14 ++++++++++++--
data/Makefile.am | 4 +++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6bbb300..ac4b7c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,8 +50,18 @@ PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
-SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
-AC_SUBST(SYSTEMD_USERDIR)
+#########################
+# Check for systemd
+#########################
+PKG_CHECK_MODULES(SYSTEMD, systemd,
+ [has_systemd=yes],
+ []
+)
+if test "x$has_systemd" = "xyes"; then
+ SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
+ AC_SUBST(SYSTEMD_USERDIR)
+ AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicator-application.service for systemd])
+fi
###########################
# gcov coverage reporting
diff --git a/data/Makefile.am b/data/Makefile.am
index f7cc652..96abc17 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,11 +16,13 @@ xdg_autostart_DATA = ayatana-indicator-application.desktop
overridedir = $(pkgdatadir)
override_DATA = ordering-override.keyfile
+#if defined(HAVE_SYSTEMD)
%.service: %.service.in
$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
+
systemddir = $(SYSTEMD_USERDIR)
systemd_DATA = ayatana-indicator-application.service
+#endif
upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
upstartsystemdoverride_DATA = ayatana-indicator-application.override
--
2.11.0
|