[at-spi2-core] Remove references to dbus-daemon-launch-helper

[Mike Gorse <mgorse src gnome org>]

commit ea56de2c6508b6a3ed4f16c22be74b37b4fc2cba
Author: Mike Gorse <mgorse novell com>
Date:   Tue Aug 24 11:17:24 2010 -0400

    Remove references to dbus-daemon-launch-helper
    
    Essentially revert the last commit, and remove the reference altogether, as
    it is meant for the system bus and may cause applications to fail to start when
    run by a user without the required permissions.

 bus/{accessibility.conf.in => accessibility.conf} |    4 +--
 configure.ac                                      |   22 ---------------------
 2 files changed, 1 insertions(+), 25 deletions(-)
---
diff --git a/bus/accessibility.conf.in b/bus/accessibility.conf
similarity index 93%
rename from bus/accessibility.conf.in
rename to bus/accessibility.conf
index 5e3988a..d0128a0 100644
--- a/bus/accessibility.conf.in
+++ b/bus/accessibility.conf
@@ -5,9 +5,7 @@
 
   <fork/>
 
-  <standard_system_servicedirs/>
-
-  <servicehelper>@DBUS_DAEMON_LAUNCH_HELPER@</servicehelper>
+  <standard_session_servicedirs/>
 
   <auth>EXTERNAL</auth>
 
diff --git a/configure.ac b/configure.ac
index b9e8bf4..b935b08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,27 +150,6 @@ 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])])
@@ -196,7 +175,6 @@ AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
 AC_CONFIG_FILES([Makefile
 	xml/Makefile
 	registryd/Makefile
-	bus/accessibility.conf
 	bus/Makefile])
 
 AC_OUTPUT