Index: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c =================================================================== --- subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (revision 33103) +++ subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (working copy) @@ -32,7 +32,6 @@ #include "svn_private_config.h" #include -#include #include @@ -55,11 +54,6 @@ return FALSE; } - if (! dbus_bus_get(DBUS_BUS_SESSION, NULL)) - { - return FALSE; - } - if (! gnome_keyring_is_available()) { return FALSE; @@ -107,11 +101,6 @@ return FALSE; } - if (! dbus_bus_get(DBUS_BUS_SESSION, NULL)) - { - return FALSE; - } - if (! gnome_keyring_is_available()) { return FALSE; Index: configure.ac =================================================================== --- configure.ac (revision 33103) +++ configure.ac (working copy) @@ -331,11 +331,11 @@ if test "$enable_shared" = "yes"; then if test "$APR_HAS_DSO" = "yes"; then if test "$HAVE_PKG_CONFIG" = "yes"; then - AC_MSG_CHECKING([for GLib, D-Bus and GNOME Keyring .pc files]) - if pkg-config --exists glib-2.0 dbus-1 gnome-keyring-1; then + AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files]) + if pkg-config --exists glib-2.0 gnome-keyring-1; then AC_MSG_RESULT([yes]) old_CPPFLAGS="$CPPFLAGS" - SVN_GNOME_KEYRING_INCLUDES="`pkg-config --cflags glib-2.0 dbus-1 gnome-keyring-1`" + SVN_GNOME_KEYRING_INCLUDES="`pkg-config --cflags glib-2.0 gnome-keyring-1`" CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES" AC_CHECK_HEADER(gnome-keyring.h, with_gnome_keyring=yes, with_gnome_keyring=no) AC_MSG_CHECKING([for GNOME Keyring]) @@ -344,14 +344,14 @@ AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], [Is GNOME Keyring support enabled?]) CPPFLAGS="$old_CPPFLAGS" - SVN_GNOME_KEYRING_LIBS="`pkg-config --libs glib-2.0 dbus-1 gnome-keyring-1`" + SVN_GNOME_KEYRING_LIBS="`pkg-config --libs glib-2.0 gnome-keyring-1`" else AC_MSG_RESULT([no]) AC_MSG_ERROR([cannot find GNOME Keyring]) fi else AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot find GLib, D-Bus and GNOME Keyring .pc files]) + AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files]) fi else AC_MSG_ERROR([cannot find pkg-config])