You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/10/07 14:47:41 UTC
svn commit: r1005433 -
/subversion/branches/gpg-agent-password-store/configure.ac
Author: stylesen
Date: Thu Oct 7 12:47:41 2010
New Revision: 1005433
URL: http://svn.apache.org/viewvc?rev=1005433&view=rev
Log:
On the 'gpg-agent-password-store' branch:
* configure.ac:
(SVN_HAVE_GPG_AGENT): Defines when --with-gpg-agent option is passed
to 'configure'
Patch by: Alexander Thomas <al...@collab.net>
Modified:
subversion/branches/gpg-agent-password-store/configure.ac
Modified: subversion/branches/gpg-agent-password-store/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/gpg-agent-password-store/configure.ac?rev=1005433&r1=1005432&r2=1005433&view=diff
==============================================================================
--- subversion/branches/gpg-agent-password-store/configure.ac (original)
+++ subversion/branches/gpg-agent-password-store/configure.ac Thu Oct 7 12:47:41 2010
@@ -551,33 +551,18 @@ fi
dnl GPG Agent -------------------
AC_ARG_WITH(gpg_agent,
- AS_HELP_STRING([--with-gpg-agent],
- [Enable use of GPG AGENT for auth credentials]),
- [with_gpg_agent="$withval"],
- [with_gpg_agent=no])
-
-AC_MSG_CHECKING([whether to look for GPG AGENT])
-if test "$with_gpg_agent" != "no"; then
+AS_HELP_STRING([--with-gpg-agent],
+ [Enable use of GPG AGENT for auth credentials]))
+AC_MSG_CHECKING([whether to support GPG-Agent])
+if test "$with_gpg_agent" = "yes"; then
AC_MSG_RESULT([yes])
- if test "$svn_enable_shared" = "yes"; then
- if test "$APR_HAS_DSO" = "yes"; then
- if test "$with_gpg_agent" = "yes"; then
- AC_MSG_RESULT([yes])
- AC_DEFINE([SVN_HAVE_GPG_AGENT], [1],
- [Is GPG Agent support enabled?])
- SVN_GPG_AGENT_LIBS="-lgcrypt11"
- fi
- else
- AC_MSG_ERROR([APR does not have support for DSOs])
- fi
- else
- AC_MSG_ERROR([--with-gpg-agent conflicts with --disable-shared])
- fi
+ AC_DEFINE([SVN_HAVE_GPG_AGENT], [1],
+ [Is GPG Agent support enabled?])
else
AC_MSG_RESULT([no])
fi
-AC_SUBST(SVN_GPG_AGENT_LIBS)
+AC_SUBST(SVN_HAVE_GPG_AGENT)
dnl GNOME Keyring -------------------