gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Wednesday, December 22, 2004 @ 00:40:51
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

As always, CVS leaves out the local directory?


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


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.227 gnupg/ChangeLog:1.228
--- gnupg/ChangeLog:1.227	Mon Dec 20 11:05:20 2004
+++ gnupg/ChangeLog	Wed Dec 22 00:40:51 2004
@@ -1,3 +1,8 @@
+2004-12-21  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Add check for --enable-ftp.  It is disabled by
+	default for now.
+
 2004-12-18  David Shaw  <dshaw at jabberwocky.com>
 
 	* configure.ac: Call the new GNUPG_CHECK_READLINE macro for
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.119 gnupg/configure.ac:1.120
--- gnupg/configure.ac:1.119	Sat Dec 18 23:39:31 2004
+++ gnupg/configure.ac	Wed Dec 22 00:40:51 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.119 $)dnl
+dnlAC_REVISION($Revision: 1.120 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -323,6 +323,13 @@
       try_finger=$enableval, try_finger=yes)
     AC_MSG_RESULT($try_finger)
 
+    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_MSG_RESULT($try_ftp)
+
     AC_MSG_CHECKING([whether email keyserver support is requested])
     AC_ARG_ENABLE(mailto,
       AC_HELP_STRING([--disable-mailto],
@@ -641,6 +648,14 @@
 AC_SUBST(LDAPLIBS)
 AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "")
 
+if test "$try_ftp" = yes ; then
+  GNUPG_CHECK_LIBCURL
+
+  if test x"$have_libcurl" = xyes ; then
+     AC_SUBST(GPGKEYS_FTP,"gpgkeys_ftp$EXEEXT")
+  fi
+fi
+
 dnl This isn't necessarily sendmail itself, but anything that gives a
 dnl sendmail-ish interface to the outside world.  That includes qmail,
 dnl postfix, etc.  Basically, anything that can handle "sendmail -t".