gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Wednesday, December 22, 2004 @ 18:07:39
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

* configure.ac: --enable-ftp is on by default, --with-libcurl is off by
default.  If we have neither of --enable-ftp or --enable-http, don't even
check for curl.


--------------+
 ChangeLog    |    6 ++++++
 configure.ac |   28 +++++++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.228 gnupg/ChangeLog:1.229
--- gnupg/ChangeLog:1.228	Wed Dec 22 00:40:51 2004
+++ gnupg/ChangeLog	Wed Dec 22 18:07:39 2004
@@ -1,3 +1,9 @@
+2004-12-22  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: --enable-ftp is on by default, --with-libcurl is
+	off by default.  If we have neither of --enable-ftp or
+	--enable-http, don't even check for curl.
+
 2004-12-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Add check for --enable-ftp.  It is disabled by
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.120 gnupg/configure.ac:1.121
--- gnupg/configure.ac:1.120	Wed Dec 22 00:40:51 2004
+++ gnupg/configure.ac	Wed Dec 22 18:07:39 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.120 $)dnl
+dnlAC_REVISION($Revision: 1.121 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -325,9 +325,9 @@
 
     AC_MSG_CHECKING([whether ftp key fetching support is requested])
     AC_ARG_ENABLE(ftp,
-      AC_HELP_STRING([--enable-ftp],
-        [enable ftp key fetching interface only]),
-      try_ftp=$enableval, try_ftp=no)
+      AC_HELP_STRING([--disable-ftp],
+        [disable ftp key fetching interface only]),
+      try_ftp=$enableval, try_ftp=yes)
     AC_MSG_RESULT($try_ftp)
 
     AC_MSG_CHECKING([whether email keyserver support is requested])
@@ -526,12 +526,17 @@
 
 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
@@ -648,12 +653,17 @@
 AC_SUBST(LDAPLIBS)
 AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "")
 
-if test "$try_ftp" = yes ; then
-  GNUPG_CHECK_LIBCURL
+dnl If we have neither FTP or HTTP defined, then don't bother to check
+dnl for curl.
 
-  if test x"$have_libcurl" = xyes ; then
-     AC_SUBST(GPGKEYS_FTP,"gpgkeys_ftp$EXEEXT")
-  fi
+if test "$try_ftp" = yes || test "$try_http" = yes ; then
+   GNUPG_CHECK_LIBCURL
+fi
+
+AM_CONDITIONAL(HAVE_LIBCURL, test "$have_libcurl" = "yes")
+
+if test x"$have_libcurl" = xyes ; then
+   AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
 fi
 
 dnl This isn't necessarily sendmail itself, but anything that gives a