add --with-console-auth-dir

[Kay Sievers]

Make the console auth dir configurable. Suse will need to override
the default with:
  --with-console-auth-dir=/var/run/resmgr/classes/desktop

Please apply.

Thanks,
Kay
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.121
diff -u -r1.121 configure.in
--- configure.in	29 Jun 2005 19:12:17 -0000	1.121
+++ configure.in	1 Jul 2005 11:44:56 -0000
@@ -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}
 "
 
Index: dbus/dbus-sysdeps-util.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
retrieving revision 1.4
diff -u -r1.4 dbus-sysdeps-util.c
--- dbus/dbus-sysdeps-util.c	11 May 2005 17:59:46 -0000	1.4
+++ dbus/dbus-sysdeps-util.c	1 Jul 2005 11:44:56 -0000
@@ -359,7 +359,7 @@
       return FALSE;
     }
 
-  if (!_dbus_string_append (&f, DBUS_CONSOLE_DIR))
+  if (!_dbus_string_append (&f, DBUS_CONSOLE_AUTH_DIR))
     {
       _DBUS_SET_OOM (error);
       goto out;
Index: dbus/dbus-sysdeps.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
retrieving revision 1.48
diff -u -r1.48 dbus-sysdeps.h
--- dbus/dbus-sysdeps.h	15 Jun 2005 15:59:57 -0000	1.48
+++ dbus/dbus-sysdeps.h	1 Jul 2005 11:44:56 -0000
@@ -99,8 +99,6 @@
 #define DBUS_UID_FORMAT "%lu"
 #define DBUS_GID_FORMAT "%lu"
 
-#define DBUS_CONSOLE_DIR "/var/run/console/"
-
 /**
  * Struct representing socket credentials
  */