dbus ChangeLog,1.826,1.827 configure.in,1.121,1.122

[Joe Shaw]

Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv19752

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-07-08  Joe Shaw  <joeshaw at novell.com>

	* configure.in: Add a configure option, --with-console-auth-dir
	
	* dbus/dbus-sysdeps-util.c (_dbus_user_at_console): Use the
	new setting.  Patch from Kay Sievers.

Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -d -r1.826 -r1.827
--- ChangeLog	6 Jul 2005 21:27:53 -0000	1.826
+++ ChangeLog	8 Jul 2005 14:36:13 -0000	1.827
@@ -1,3 +1,10 @@
+2005-07-08  Joe Shaw  <joeshaw at novell.com>
+
+	* configure.in: Add a configure option, --with-console-auth-dir
+	
+	* dbus/dbus-sysdeps-util.c (_dbus_user_at_console): Use the
+	new setting.  Patch from Kay Sievers.
+
 2005-07-06  Colin Walters  <walters at verbum.org>
 
 	* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- configure.in	29 Jun 2005 19:12:17 -0000	1.121
+++ configure.in	8 Jul 2005 14:36:19 -0000	1.122
@@ -70,6 +70,7 @@
 AC_ARG_WITH(test-socket-dir,    [  --with-test-socket-dir=[dirname]    Where to put sockets for make check])
 AC_ARG_WITH(system-pid-file,    [  --with-system-pid-file=[pidfile]    PID file for systemwide daemon])
 AC_ARG_WITH(system-socket,      [  --with-system-socket=[filename]     UNIX domain socket for systemwide daemon])
+AC_ARG_WITH(console-auth-dir,   [  --with-console-auth-dir=[dirname]   directory to check for console ownerhip])
 
 dnl DBUS_BUILD_TESTS controls unit tests built in to .c files 
 dnl and also some stuff in the test/ subdir
@@ -1167,6 +1168,16 @@
 
 AC_SUBST(DBUS_SYSTEM_PID_FILE)
 
+#### Directory to check for console ownership
+if ! test -z "$with_console_auth_dir"; then
+   DBUS_CONSOLE_AUTH_DIR=$with_console_auth_dir
+else
+   DBUS_CONSOLE_AUTH_DIR=/var/run/console/
+fi
+
+AC_SUBST(DBUS_CONSOLE_AUTH_DIR)
+AC_DEFINE_UNQUOTED(DBUS_CONSOLE_AUTH_DIR, "$DBUS_CONSOLE_AUTH_DIR", [Directory to check for console ownerhip])
+
 #### Tell tests where to find certain stuff in builddir
 ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
 
@@ -1360,6 +1371,7 @@
         System bus address:       ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS}
         System bus PID file:      ${DBUS_SYSTEM_PID_FILE}
         Session bus socket dir:   ${DBUS_SESSION_SOCKET_DIR}
+        Console auth dir:         ${DBUS_CONSOLE_AUTH_DIR}
         'make check' socket dir:  ${TEST_SOCKET_DIR}
 "