gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Friday, December 24, 2004 @ 20:43:16
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

* configure.ac: Use new LIBCURL_CHECK_CONFIG macro for all libcurl stuff.  
This simplifies, and we don't need the automake conditional stuff any
longer.


--------------+
 ChangeLog    |    6 ++++++
 configure.ac |   33 ++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.229 gnupg/ChangeLog:1.230
--- gnupg/ChangeLog:1.229	Wed Dec 22 18:07:39 2004
+++ gnupg/ChangeLog	Fri Dec 24 20:43:16 2004
@@ -1,3 +1,9 @@
+2004-12-24  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Use new LIBCURL_CHECK_CONFIG macro for
+	all libcurl stuff.  This simplifies, and we don't need the
+	automake conditional stuff any longer.
+
 2004-12-22  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: --enable-ftp is on by default, --with-libcurl is
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.121 gnupg/configure.ac:1.122
--- gnupg/configure.ac:1.121	Wed Dec 22 18:07:39 2004
+++ gnupg/configure.ac	Fri Dec 24 20:43:16 2004
@@ -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.121 $)dnl
+dnlAC_REVISION($Revision: 1.122 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -524,19 +524,10 @@
   AC_SUBST(GPGKEYS_HKP,"gpgkeys_hkp$EXEEXT")
 fi
 
-if test x"$try_http" = xyes ; then
-  AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT")
-  AC_DEFINE(HTTP_SUPPORT,1,[Define to include HTTP support])
-fi
-
 if test x"$try_finger" = xyes ; then
   AC_SUBST(GPGKEYS_FINGER,"gpgkeys_finger$EXEEXT")
 fi
 
-if test x"$try_ftp" = xyes ; then
-  AC_DEFINE(FTP_SUPPORT,1,[Define to include FTP support])
-fi
-
 dnl Must check for network library requirements before doing link tests
 dnl for ldap, for example. If ldap libs are static (or dynamic and without
 dnl ELF runtime link paths), then link will fail and LDAP support won't
@@ -653,16 +644,28 @@
 AC_SUBST(LDAPLIBS)
 AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "")
 
-dnl If we have neither FTP or HTTP defined, then don't bother to check
-dnl for curl.
+# If we have neither FTP or HTTP defined, then don't bother to check
+# for curl.
 
 if test "$try_ftp" = yes || test "$try_http" = yes ; then
-   GNUPG_CHECK_LIBCURL
+   LIBCURL_CHECK_CONFIG([no],,[have_libcurl=yes])
+fi
+
+# Are we doing HTTP?
+
+if test x"$try_http" = xyes ; then
+   if test x$libcurl_protocol_HTTP = xyes ; then
+      AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
+      AC_DEFINE(HTTP_VIA_LIBCURL,1,[Define if HTTP is handled via libcurl])
+   else
+      AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT")
+   fi
 fi
 
-AM_CONDITIONAL(HAVE_LIBCURL, test "$have_libcurl" = "yes")
+# Are we doing FTP?  We only do FTP if we have libcurl.
 
-if test x"$have_libcurl" = xyes ; then
+if test x"$try_ftp" = xyes && test x$libcurl_protocol_FTP = xyes ; then
+   AC_DEFINE(FTP_VIA_LIBCURL,1,[Define if FTP is handled via libcurl])
    AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
 fi