subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1387034 - /subversion/trunk/configure.ac
Date Tue, 18 Sep 2012 08:04:52 GMT
Author: stsp
Date: Tue Sep 18 08:04:52 2012
New Revision: 1387034

URL: http://svn.apache.org/viewvc?rev=1387034&view=rev
Log:
Follow-up to r1386696:

* configure.ac: Actually disable GNOME keyring compilation if the necessary
   things cannot be found. The change in r1386696 made us print a warning
   but still attempt to compile with GNOME keyring support.

Modified:
    subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1387034&r1=1387033&r2=1387034&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Tue Sep 18 08:04:52 2012
@@ -591,12 +591,15 @@ if test "$with_gnome_keyring" != "no"; t
         else
           AC_MSG_RESULT([no])
           AC_MSG_WARN([cannot find GLib and GNOME Keyring .pc files. GNOME Keyring disabled.])
+          with_gnome_keyring=no
         fi
       else
         AC_MSG_WARN([cannot find pkg-config. GNOME Keyring disabled.])
+        with_gnome_keyring=no
       fi
     else
       AC_MSG_WARN([APR does not have support for DSOs. GNOME Keyring disabled.])
+      with_gnome_keyring=no
     fi
   else
     AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])



Mime
View raw message