subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1380189 - in /subversion/branches/1.7.x-r1242759: ./ configure.ac subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Date Mon, 03 Sep 2012 10:06:29 GMT
Author: philip
Date: Mon Sep  3 10:06:29 2012
New Revision: 1380189

URL: http://svn.apache.org/viewvc?rev=1380189&view=rev
Log:
On the '1.7.x-r1242759' branch: merge r1380175 from trunk to remove
unnecessary compile-time dependencies.

Modified:
    subversion/branches/1.7.x-r1242759/   (props changed)
    subversion/branches/1.7.x-r1242759/configure.ac
    subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

Propchange: subversion/branches/1.7.x-r1242759/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1380175

Modified: subversion/branches/1.7.x-r1242759/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1242759/configure.ac?rev=1380189&r1=1380188&r2=1380189&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1242759/configure.ac (original)
+++ subversion/branches/1.7.x-r1242759/configure.ac Mon Sep  3 10:06:29 2012
@@ -532,7 +532,7 @@ AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 CPPFLAGS="$old_CPPFLAGS"
 
 
-dnl D-Bus (required for support for KWallet and GNOME Keyring) -------------------
+dnl D-Bus (required for support for KWallet) -------------------
 
 if test -n "$PKG_CONFIG"; then
   AC_MSG_CHECKING([for D-Bus .pc file])
@@ -582,31 +582,27 @@ if test "$with_gnome_keyring" != "no"; t
   if test "$svn_enable_shared" = "yes"; then
     if test "$APR_HAS_DSO" = "yes"; then
       if test -n "$PKG_CONFIG"; then
-        if test "$HAVE_DBUS" = "yes"; then
-          AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
-          if $PKG_CONFIG --exists glib-2.0 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 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])
+          if test "$with_gnome_keyring" = "yes"; then
             AC_MSG_RESULT([yes])
-            old_CPPFLAGS="$CPPFLAGS"
-            SVN_GNOME_KEYRING_INCLUDES="$DBUS_CPPFLAGS `$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])
-            if test "$with_gnome_keyring" = "yes"; then
-              AC_MSG_RESULT([yes])
-              AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
-                        [Is GNOME Keyring support enabled?])
-              CPPFLAGS="$old_CPPFLAGS"
-              SVN_GNOME_KEYRING_LIBS="$DBUS_LIBS `$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
-            else
-              AC_MSG_RESULT([no])
-              AC_MSG_ERROR([cannot find GNOME Keyring])
-            fi
+            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 gnome-keyring-1`"
           else
             AC_MSG_RESULT([no])
-            AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
+            AC_MSG_ERROR([cannot find GNOME Keyring])
           fi
         else
-          AC_MSG_ERROR([cannot find D-Bus])
+          AC_MSG_RESULT([no])
+          AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files])
         fi
       else
         AC_MSG_ERROR([cannot find pkg-config])

Modified: subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1380189&r1=1380188&r2=1380189&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
(original)
+++ subversion/branches/1.7.x-r1242759/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Mon Sep  3 10:06:29 2012
@@ -38,7 +38,6 @@
 #include "svn_private_config.h"
 
 #include <glib.h>
-#include <dbus/dbus.h>
 #include <gnome-keyring.h>
 
 



Mime
View raw message