2003-04-06 Havoc Pennington <hp@pobox.com>

	* bus/bus.c (bus_context_new): fix wrong handling of
	server_data_slot_unref() in the error case.

	* dbus/dbus-internals.h (_dbus_assert): change so it passes
	"(condition) != 0" to _dbus_real_assert so that
	"_dbus_assert (pointer)" doesn't cause a warning

	* bus/main.c (main): accept --print-address option to print out
	the message bus address

	* dbus/dbus-sysdeps.c (_dbus_generate_random_ascii): export this

	* dbus/dbus-transport.c (_dbus_transport_open): special error for
	"tmpdir" option to unix: address on client side

	* dbus/dbus-server.c (dbus_server_listen): handle "tmpdir" option
	to unix: address

	* configure.in (TEST_SOCKET_DIR): locate a temporary directory
	we can use to create sockets in the test suite.

	* bus/main.c (signal_handler): on SIGTERM, exit the daemon
	cleanly. To be used for testing.

	* dbus/dbus-spawn.c (babysit): use _dbus_set_signal_handler()

	* dbus/dbus-sysdeps.c (_dbus_set_signal_handler): new

	* dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new):
	handle trying to call this when there's no servers active

1 files changed, 51 insertions, 17 deletions

diff --git a/configure.in b/configure.in
index 27483570..d37a7c4b 100644
--- a/configure.in
+++ b/configure.in
@@ -31,8 +31,10 @@ AC_ARG_ENABLE(verbose-mode, [  --enable-verbose-mode support verbose debug mode]
 AC_ARG_ENABLE(asserts, [  --enable-asserts include assertion checks],enable_asserts=$enableval,enable_asserts=yes)
 AC_ARG_ENABLE(gcov,    [  --enable-gcov compile with coverage profiling instrumentation (gcc only)],enable_gcov=$enableval,enable_gcov=no)
 
-AC_ARG_WITH(xml,          [  --with-xml=[libxml/expat] XML library to use])
-AC_ARG_WITH(init-scripts, [  --with-init-scripts=[redhat] Style of init scripts to install])
+AC_ARG_WITH(xml,                [  --with-xml=[libxml/expat] XML library to use])
+AC_ARG_WITH(init-scripts,       [  --with-init-scripts=[redhat] Style of init scripts to install])
+AC_ARG_WITH(session-socket-dir, [  --with-session-socket-dir=[dirname] Where to put sockets for the per-login-session message bus])
+AC_ARG_WITH(test-socket-dir,    [  --with-test-socket-dir=[dirname] Where to put sockets for make check])
 
 dnl DBUS_BUILD_TESTS controls unit tests built in to .c files 
 dnl and also some stuff in the test/ subdir
@@ -123,6 +125,9 @@ else
   fi
 fi
 
+# compress spaces in cflags
+CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'`
+
 if test x$enable_gcov = xyes; then
      ## so that config.h changes when you toggle gcov support
      AC_DEFINE_UNQUOTED(DBUS_GCOV_ENABLED, 1, [Defined if gcov is enabled to force a rebuild due to config.h changing])
@@ -160,6 +165,7 @@ AC_DEFINE_UNQUOTED(DBUS_INT64_TYPE, $dbusint64, [64-bit integer type])
 ## byte order
 AC_C_BIGENDIAN
 
+#### Various functions
 AC_CHECK_LIB(socket,socket)
 AC_CHECK_LIB(nsl,gethostbyname)
 
@@ -443,6 +449,32 @@ TEST_PATH(EXIT_BINARY, test-exit)
 TEST_PATH(SEGFAULT_BINARY, test-segfault)
 TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
 
+#### Find socket directories
+if ! test -z "$TMPDIR" ; then
+   DEFAULT_SOCKET_DIR=$TMPDIR
+elif ! test -z "$TEMP" ; then
+   DEFAULT_SOCKET_DIR=$TEMP
+elif ! test -z "$TMP" ; then
+   DEFAULT_SOCKET_DIR=$TMP
+else
+   DEFAULT_SOCKET_DIR=/tmp
+fi
+
+if ! test -z "$with_test_socket_dir" ; then
+   TEST_SOCKET_DIR="$with_test_socket_dir"
+else
+   TEST_SOCKET_DIR=$DEFAULT_SOCKET_DIR
+fi
+AC_SUBST(TEST_SOCKET_DIR)
+
+if ! test -z "$with_session_socket_dir" ; then
+   DBUS_SESSION_SOCKET_DIR="$with_session_socket_dir"
+else
+   DBUS_SESSION_SOCKET_DIR=$DEFAULT_SOCKET_DIR
+fi
+AC_SUBST(DBUS_SESSION_SOCKET_DIR)
+
+
 AC_OUTPUT([
 Doxyfile
 bus/system.conf
@@ -466,21 +498,23 @@ echo "
                     D-BUS $VERSION
                   ==============
 
-	prefix:                 ${prefix}
-	source code location:	${srcdir}
-	compiler:		${CC}
-	cflags:		        ${CFLAGS}
-
-        Maintainer mode:        ${USE_MAINTAINER_MODE}
-        gcc coverage profiling: ${enable_gcov}
-        Building unit tests:    ${enable_tests}
-        Building verbose mode:  ${enable_verbose_mode}
-        Building assertions:    ${enable_asserts}
-        Building Qt bindings:   ${have_qt}
-        Building GLib bindings: ${have_glib}
-        Using XML parser:       ${with_xml}
-        System bus socket:      ${EXPANDED_LOCALSTATEDIR}/${DBUS_SYSTEM_SOCKET}
-        Init scripts style:     ${with_init_scripts}
+	prefix:                   ${prefix}
+	source code location:	  ${srcdir}
+	compiler:		  ${CC}
+	cflags:		          ${CFLAGS}
+
+        Maintainer mode:          ${USE_MAINTAINER_MODE}
+        gcc coverage profiling:   ${enable_gcov}
+        Building unit tests:      ${enable_tests}
+        Building verbose mode:    ${enable_verbose_mode}
+        Building assertions:      ${enable_asserts}
+        Building Qt bindings:     ${have_qt}
+        Building GLib bindings:   ${have_glib}
+        Using XML parser:         ${with_xml}
+        Init scripts style:       ${with_init_scripts}
+        System bus socket:        ${EXPANDED_LOCALSTATEDIR}/${DBUS_SYSTEM_SOCKET}
+        Session bus socket dir:   ${DBUS_SESSION_SOCKET_DIR}
+        'make check' socket dir:  ${TEST_SOCKET_DIR}
 "
 
 if test x$enable_tests = xyes; then