[evolution-data-server] Bug 755735 - Make D-Bus session service directory configurable

[Milan Crha <mcrha src gnome org>]

commit e9d55546a6e089c3c590f306039ad5278b8c82f3
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Fri Oct 2 07:16:33 2015 +0200

    Bug 755735 - Make D-Bus session service directory configurable

 configure.ac                                       |    8 ++++++++
 services/evolution-addressbook-factory/Makefile.am |   13 ++++++++-----
 services/evolution-calendar-factory/Makefile.am    |   14 +++++++++-----
 services/evolution-source-registry/Makefile.am     |    9 ++++-----
 services/evolution-user-prompter/Makefile.am       |   13 ++++++++-----
 5 files changed, 37 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a91443f..7ca4aff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1737,6 +1737,14 @@ m4_pattern_allow([AM_V_GEN])
 EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; $(AM_V_GEN) sed -e "s|\ 
libexecdir\@|$(servicelibexecdir)|" -e s"|\ 
ADDRESS_BOOK_DBUS_SERVICE_NAME\@|$(ADDRESS_BOOK_DBUS_SERVICE_NAME)|" -e "s|\ 
CALENDAR_DBUS_SERVICE_NAME\@|$(CALENDAR_DBUS_SERVICE_NAME)|" -e "s|\ 
SOURCES_DBUS_SERVICE_NAME\@|$(SOURCES_DBUS_SERVICE_NAME)|" -e "s|\ 
USER_PROMPTER_DBUS_SERVICE_NAME\@|$(USER_PROMPTER_DBUS_SERVICE_NAME)|" $< > $@'
 AC_SUBST(EVO_SUBST_SERVICE_RULE)
 
+AC_ARG_WITH([dbus-service-dir],
+       AS_HELP_STRING([--with-dbus-service-dir=PATH],
+       [Set directory for D-Bus service files]
+       [[default=${datadir}/dbus-1/services]]),
+       [dbus_servicedir="$withval"],
+       [dbus_servicedir='${datadir}/dbus-1/services'])
+AC_SUBST([dbus_servicedir])
+
 dnl ******************************
 dnl GLib stuff
 dnl ******************************
diff --git a/services/evolution-addressbook-factory/Makefile.am 
b/services/evolution-addressbook-factory/Makefile.am
index 37e326c..00eaa0c 100644
--- a/services/evolution-addressbook-factory/Makefile.am
+++ b/services/evolution-addressbook-factory/Makefile.am
@@ -1,12 +1,15 @@
 NULL =
 
-service_in_files = org.gnome.evolution.dataserver.AddressBook.service.in
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
+dbus_service_in_files = org.gnome.evolution.dataserver.AddressBook.service.in
+dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
 @EVO_SUBST_SERVICE_RULE@
 
-CLEANFILES = $(service_DATA)
-EXTRA_DIST = $(service_in_files)
+CLEANFILES = \
+       $(dbus_service_DATA) \
+       $(NULL)
+EXTRA_DIST = \
+       $(dbus_service_in_files) \
+       $(NULL)
 
 libexec_PROGRAMS = evolution-addressbook-factory
 
diff --git a/services/evolution-calendar-factory/Makefile.am b/services/evolution-calendar-factory/Makefile.am
index 2bdb1a4..153d1b9 100644
--- a/services/evolution-calendar-factory/Makefile.am
+++ b/services/evolution-calendar-factory/Makefile.am
@@ -1,12 +1,16 @@
 NULL =
 
-service_in_files = org.gnome.evolution.dataserver.Calendar.service.in
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
+dbus_service_in_files = org.gnome.evolution.dataserver.Calendar.service.in
+dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
 @EVO_SUBST_SERVICE_RULE@
 
-CLEANFILES = $(service_DATA)
-EXTRA_DIST = $(service_in_files)
+CLEANFILES = \
+       $(dbus_service_DATA) \
+       $(NULL)
+
+EXTRA_DIST = \
+       $(dbus_service_in_files) \
+       $(NULL)
 
 libexec_PROGRAMS = evolution-calendar-factory
 
diff --git a/services/evolution-source-registry/Makefile.am b/services/evolution-source-registry/Makefile.am
index 8eafbd8..cc1841c 100644
--- a/services/evolution-source-registry/Makefile.am
+++ b/services/evolution-source-registry/Makefile.am
@@ -24,21 +24,20 @@ builtin_sources = $(builtin_sources_in_files:.source.in=.source)
 %.source: %.source.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
        $(AM_V_GEN) $(MKDIR_P) builtin && LC_ALL=C $(INTLTOOL_MERGE) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-service_in_files = org.gnome.evolution.dataserver.Sources.service.in
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
+dbus_service_in_files = org.gnome.evolution.dataserver.Sources.service.in
+dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
 @EVO_SUBST_SERVICE_RULE@
 
 CLEANFILES = \
        $(BUILT_SOURCES) \
        $(builtin_sources) \
-       $(service_DATA) \
+       $(dbus_service_DATA) \
        $(NULL)
 
 EXTRA_DIST = \
        evolution-source-registry-resource.xml \
        $(builtin_sources_in_files) \
-       $(service_in_files) \
+       $(dbus_service_in_files) \
        $(NULL)
 
 libexec_PROGRAMS = \
diff --git a/services/evolution-user-prompter/Makefile.am b/services/evolution-user-prompter/Makefile.am
index 941b7a4..9a5e284 100644
--- a/services/evolution-user-prompter/Makefile.am
+++ b/services/evolution-user-prompter/Makefile.am
@@ -1,12 +1,15 @@
 NULL =
 
-service_in_files = org.gnome.evolution.dataserver.UserPrompter.service.in
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
+dbus_service_in_files = org.gnome.evolution.dataserver.UserPrompter.service.in
+dbus_service_DATA = $(dbus_service_in_files:.service.in=.service)
 @EVO_SUBST_SERVICE_RULE@
 
-CLEANFILES = $(service_DATA)
-EXTRA_DIST = $(service_in_files)
+CLEANFILES = \
+       $(dbus_service_DATA) \
+       $(NULL)
+EXTRA_DIST = \
+       $(dbus_service_in_files) \
+       $(NULL)
 
 PROMPT_USER_SOURCES = prompt-user-gtk.c
 PROMPT_USER_CFLAGS = $(GNOME_PLATFORM_CFLAGS) $(GTK_CFLAGS)