gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Saturday, April 16, 2005 @ 20:20:01
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

* configure.ac: Add --disable-old-hkp option that can be used along
with --with-libcurl to build the curl version of HKP.


--------------+
 ChangeLog    |    5 +++++
 configure.ac |   10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.247 gnupg/ChangeLog:1.248
--- gnupg/ChangeLog:1.247	Tue Apr 12 18:11:03 2005
+++ gnupg/ChangeLog	Sat Apr 16 20:20:01 2005
@@ -1,3 +1,8 @@
+2005-04-16  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Add --disable-old-hkp option that can be used
+	along with --with-libcurl to build the curl version of HKP.
+
 2005-04-12  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Check for memrchr()
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.139 gnupg/configure.ac:1.140
--- gnupg/configure.ac:1.139	Tue Apr 12 18:11:03 2005
+++ gnupg/configure.ac	Sat Apr 16 20:20:01 2005
@@ -19,7 +19,7 @@
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision: 1.139 $)dnl
+dnlAC_REVISION($Revision: 1.140 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -635,6 +635,8 @@
 
 # Are we doing HTTP?
 
+old_hkp=yes
+
 if test x"$try_http" = xyes ; then
    if test x$libcurl_protocol_HTTP = xyes ; then
       AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
@@ -642,11 +644,17 @@
       if test x$libcurl_protocol_HTTPS = xyes ; then
          AC_DEFINE(HTTPS_VIA_LIBCURL,1,[Define if HTTPS is handled via libcurl])
       fi
+
+     AC_ARG_ENABLE(old-hkp,
+        AC_HELP_STRING([--disable-old-hkp],[disable old HKP processing code and use the new]),old_hkp=$enableval)
+
    else
       AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT")
    fi
 fi
 
+AM_CONDITIONAL(OLD_HKP,test x"$old_hkp" != xno)
+
 # Are we doing FTP?  We only do FTP if we have libcurl.
 
 if test x"$try_ftp" = xyes && test x$libcurl_protocol_FTP = xyes ; then