gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Sunday, April 17, 2005 @ 02:06:04
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

* configure.ac: Remove --disable-old-hkp - use new HKP handler for
--with-libcurl or --enable-fake-curl.


--------------+
 ChangeLog    |    3 +++
 configure.ac |   16 +++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.248 gnupg/ChangeLog:1.249
--- gnupg/ChangeLog:1.248	Sat Apr 16 20:20:01 2005
+++ gnupg/ChangeLog	Sun Apr 17 02:06:04 2005
@@ -1,5 +1,8 @@
 2005-04-16  David Shaw  <dshaw at jabberwocky.com>
 
+	* configure.ac: Remove --disable-old-hkp - use new HKP handler for
+	--with-libcurl or --enable-fake-curl.
+
 	* configure.ac: Add --disable-old-hkp option that can be used
 	along with --with-libcurl to build the curl version of HKP.
 
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.140 gnupg/configure.ac:1.141
--- gnupg/configure.ac:1.140	Sat Apr 16 20:20:01 2005
+++ gnupg/configure.ac	Sun Apr 17 02:06:04 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.140 $)dnl
+dnlAC_REVISION($Revision: 1.141 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -628,14 +628,14 @@
 else
    # If we have neither FTP or HTTP defined, then don't bother to check
    # for curl.
-   if test x"$try_ftp" = xyes || test x"$try_http" = xyes ; then
-      LIBCURL_CHECK_CONFIG([no])
+   if test x"$try_hkp" = xyes || test x"$try_ftp" = xyes || test x"$try_http" = xyes ; then
+      LIBCURL_CHECK_CONFIG([no],,[with_curl=yes])
    fi
 fi
 
-# Are we doing HTTP?
+AM_CONDITIONAL(WITH_CURL,test x"$with_curl" = xyes || test x"$fake_curl" = xyes)
 
-old_hkp=yes
+# Are we doing HTTP?
 
 if test x"$try_http" = xyes ; then
    if test x$libcurl_protocol_HTTP = xyes ; then
@@ -644,17 +644,11 @@
       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