summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch')
-rw-r--r--meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
deleted file mode 100644
index 1f8c9f374f..0000000000
--- a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 21 Jun 2016 16:00:02 +0300
4Subject: [PATCH] build: Add --with-systemduserunitdir
5
6Default to "pkg-config --variable=systemduserunitdir systemd" but
7allow overriding the value.
8
9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911]
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
12---
13 bus/Makefile.am | 2 +-
14 configure.ac | 9 +++++++++
15 2 files changed, 10 insertions(+), 1 deletion(-)
16
17diff --git a/bus/Makefile.am b/bus/Makefile.am
18index 688f82a..10cde62 100644
19--- a/bus/Makefile.am
20+++ b/bus/Makefile.am
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
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
29 $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
30diff --git a/configure.ac b/configure.ac
31index 8c4fca2..1415cca 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -146,6 +146,15 @@ else
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+
45+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
46+
47 GOBJECT_INTROSPECTION_CHECK([1.32.0])
48
49 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
50--
512.14.1
52