| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Tue, 21 Jun 2016 16:00:02 +0300 |
| 4 | Subject: [PATCH] build: Add --with-systemduserunitdir |
| 5 | |
| 6 | Default to "pkg-config --variable=systemduserunitdir systemd" but |
| 7 | allow overriding the value. |
| 8 | |
| 9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] |
| 10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 11 | |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 12 | --- |
| 13 | bus/Makefile.am | 2 +- |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 14 | configure.ac | 9 +++++++++ |
| 15 | 2 files changed, 10 insertions(+), 1 deletion(-) |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 16 | |
| 17 | diff --git a/bus/Makefile.am b/bus/Makefile.am |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | index 688f82a..10cde62 100644 |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 19 | --- a/bus/Makefile.am |
| 20 | +++ b/bus/Makefile.am |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | @@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in |
| 22 | EXTRA_DIST += org.a11y.Bus.service.in |
| 23 | CLEANFILES += org.a11y.Bus.service |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 24 | |
| 25 | -systemd_userdir = $(prefix)/lib/systemd/user |
| 26 | +systemd_userdir = $(systemduserunitdir) |
| 27 | systemd_user_DATA = at-spi-dbus-bus.service |
| 28 | at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 29 | $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 30 | diff --git a/configure.ac b/configure.ac |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 31 | index 8c4fca2..1415cca 100644 |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 32 | --- a/configure.ac |
| 33 | +++ b/configure.ac |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 34 | @@ -146,6 +146,15 @@ else |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 35 | fi |
| 36 | AC_SUBST(DBUS_SERVICES_DIR) |
| 37 | |
| 38 | +AC_ARG_WITH([systemduserunitdir], |
| 39 | + AS_HELP_STRING([--with-systemduserunitdir=DIR], |
| 40 | + [Directory for systemd service files]), |
| 41 | + [], |
| 42 | + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) |
| 43 | +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) |
| 44 | + |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 45 | +AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) |
| 46 | + |
| 47 | GOBJECT_INTROSPECTION_CHECK([1.32.0]) |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 48 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 49 | AC_SUBST(LIBTOOL_EXPORT_OPTIONS) |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 50 | -- |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 51 | 2.14.1 |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 52 | |