dbus ChangeLog,1.1172,1.1173 configure.in,1.192,1.193

[John Palmieri]

Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv23029

Modified Files:
	ChangeLog configure.in 
Log Message:
* tools/dbus-launch.c (main): run the dbus-daemon in the builddir
  if tests are enabled and the DBUS_USE_TEST_BINARY env variable is set

* tools/run-with-tmp-session-bus.sh: set DBUS_USE_TEST_BINARY
  before we run dbus-launch

* configure.in: define TEST_BUS_BINARY to be the full path to 
  dbus-daemon in the build root 


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1172
retrieving revision 1.1173
diff -u -d -r1.1172 -r1.1173
--- ChangeLog	25 Oct 2006 16:42:36 -0000	1.1172
+++ ChangeLog	26 Oct 2006 15:55:44 -0000	1.1173
@@ -1,3 +1,14 @@
+2006-10-26  John (J5) Palmieri  <johnp at redhat.com>
+
+	* tools/dbus-launch.c (main): run the dbus-daemon in the builddir
+	if tests are enabled and the DBUS_USE_TEST_BINARY env variable is set
+
+	* tools/run-with-tmp-session-bus.sh: set DBUS_USE_TEST_BINARY
+	before we run dbus-launch
+
+	* configure.in: define TEST_BUS_BINARY to be the full path to 
+	dbus-daemon in the build root 
+
 2006-10-25  Sjoerd Simons  <sjoerd at luon.net>
 
 	* dbus/Makefile.am:

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- configure.in	18 Oct 2006 20:28:26 -0000	1.192
+++ configure.in	26 Oct 2006 15:55:44 -0000	1.193
@@ -1138,6 +1138,10 @@
 TEST_PATH(SEGFAULT_BINARY, test-segfault)
 TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
 
+AC_DEFINE_UNQUOTED(TEST_BUS_BINARY, "$DBUS_PWD/bus/dbus-daemon",
+                   [Full path to the daemon in the builddir])
+AC_SUBST(TEST_BUS_BINARY)
+
 #### Find socket directories
 if ! test -z "$TMPDIR" ; then
    DEFAULT_SOCKET_DIR=$TMPDIR