forked from brl/citadel
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
|
From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||
|
|
Date: Tue, 21 Jun 2016 16:00:02 +0300
|
||
|
|
Subject: [PATCH] build: Add --with-systemduserunitdir
|
||
|
|
|
||
|
|
Default to "pkg-config --variable=systemduserunitdir systemd" but
|
||
|
|
allow overriding the value.
|
||
|
|
|
||
|
|
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911]
|
||
|
|
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
bus/Makefile.am | 2 +-
|
||
|
|
configure.ac | 9 +++++++++
|
||
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/bus/Makefile.am b/bus/Makefile.am
|
||
|
|
index 688f82a..10cde62 100644
|
||
|
|
--- a/bus/Makefile.am
|
||
|
|
+++ b/bus/Makefile.am
|
||
|
|
@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in
|
||
|
|
EXTRA_DIST += org.a11y.Bus.service.in
|
||
|
|
CLEANFILES += org.a11y.Bus.service
|
||
|
|
|
||
|
|
-systemd_userdir = $(prefix)/lib/systemd/user
|
||
|
|
+systemd_userdir = $(systemduserunitdir)
|
||
|
|
systemd_user_DATA = at-spi-dbus-bus.service
|
||
|
|
at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile
|
||
|
|
$(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 8c4fca2..1415cca 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -146,6 +146,15 @@ else
|
||
|
|
fi
|
||
|
|
AC_SUBST(DBUS_SERVICES_DIR)
|
||
|
|
|
||
|
|
+AC_ARG_WITH([systemduserunitdir],
|
||
|
|
+ AS_HELP_STRING([--with-systemduserunitdir=DIR],
|
||
|
|
+ [Directory for systemd service files]),
|
||
|
|
+ [],
|
||
|
|
+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
|
||
|
|
+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
|
||
|
|
+
|
||
|
|
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
|
||
|
|
+
|
||
|
|
GOBJECT_INTROSPECTION_CHECK([1.32.0])
|
||
|
|
|
||
|
|
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|