[at-spi2-core] Make location of dbus-daemon-launch-helper configurable

[Mike Gorse <mgorse src gnome org>]

commit 5fcc08c2f012cef1aca98b938c5899dae114a2cc
Author: Mike Gorse <mgorse novell com>
Date:   Tue Aug 24 04:37:37 2010 -0400

    Make location of dbus-daemon-launch-helper configurable

 bus/{accessibility.conf => accessibility.conf.in} |    2 +-
 configure.ac                                      |   22 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/bus/accessibility.conf b/bus/accessibility.conf.in
similarity index 94%
rename from bus/accessibility.conf
rename to bus/accessibility.conf.in
index ee05ccf..5e3988a 100644
--- a/bus/accessibility.conf
+++ b/bus/accessibility.conf.in
@@ -7,7 +7,7 @@
 
   <standard_system_servicedirs/>
 
-  <servicehelper>/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>
+  <servicehelper>@DBUS_DAEMON_LAUNCH_HELPER@</servicehelper>
 
   <auth>EXTERNAL</auth>
 
diff --git a/configure.ac b/configure.ac
index b935b08..b9e8bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,27 @@ if test "$DBUS_DAEMON" = "XXXDBUSDAEMONNOTFOUND"; then
 fi
 AC_SUBST(DBUS_DAEMON)
 
+AC_ARG_WITH([dbus_daemon_launch_helperdir],
+	[AS_HELP_STRING([--with-dbus-daemon-launch-helperdir=<directory>],
+		[Directory where dbus-daemon-launch-helper is installed])],
+    [DBUS_DAEMON_LAUNCH_HELPER="$with_dbus_daemon_launch_helperdir/dbus-daemon-launch-helper"]
+	)
+dnl Can't use AC_PATH_PROG since it will fail if we don't have read access
+if test "x$DBUS_DAEMON_LAUNCH_HELPER" == "x"; then
+	if test "-f /lib/dbus-1/dbus-daemon-launch-helper"; then
+		DBUS_DAEMON_LAUNCH_HELPER=/lib/dbus-1/dbus-daemon-launch-helper
+	elif test "-f /lib/dbus-1.0/dbus-daemon-launch-helper"; then
+		DBUS_DAEMON_LAUNCH_HELPER=/lib/dbus-1.0/dbus-daemon-launch-helper
+	elif test "-f $libexecdir/dbus-daemon-launch-helper"; then
+		DBUS_DAEMON_LAUNCH_HELPER=$libexecdir/dbus-daemon-launch-helper
+	else
+		DBUS_DAEMON_LAUNCH_HELPER="$libexecdir/dbus-daemon-launch-helper"
+		AC_MSG_WARN([at-spi2 relies on dbus, and dbus-daemon-launch-helper was not found])
+		AC_MSG_WARN([we assume that it will be installed in "$libexecdir"])
+	fi
+fi
+AC_SUBST(DBUS_DAEMON_LAUNCH_HELPER)
+
 AC_ARG_WITH(dbus-services,
            [AS_HELP_STRING([--with-dbus-services=<directory>],
            [where D-BUS services directory is])])
@@ -175,6 +196,7 @@ AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
 AC_CONFIG_FILES([Makefile
 	xml/Makefile
 	registryd/Makefile
+	bus/accessibility.conf
 	bus/Makefile])
 
 AC_OUTPUT