security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* configure.ac: --enable-ftp is on by default, --with-libcurl is off by

Browse Source 
default.  If we have neither of --enable-ftp or --enable-http, don't even
check for curl.
This commit is contained in:
David Shaw 2004-12-22 17:07:39 +00:00
parent e3821bfc2a
commit 034b095f31
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-22 David Shaw <dshaw@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@jabberwocky.com> 2004-12-21 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Add check for --enable-ftp. It is disabled by * configure.ac: Add check for --enable-ftp. It is disabled by

26
configure.ac
View File

@ -325,9 +325,9 @@ dnl LDAP is defined only after we confirm the library is available later
AC_MSG_CHECKING([whether ftp key fetching support is requested]) AC_MSG_CHECKING([whether ftp key fetching support is requested])
AC_ARG_ENABLE(ftp, AC_ARG_ENABLE(ftp,
AC_HELP_STRING([--enable-ftp], AC_HELP_STRING([--disable-ftp],
[enable ftp key fetching interface only]), [disable ftp key fetching interface only]),
try_ftp=$enableval, try_ftp=no) try_ftp=$enableval, try_ftp=yes)
AC_MSG_RESULT($try_ftp) AC_MSG_RESULT($try_ftp)
AC_MSG_CHECKING([whether email keyserver support is requested]) AC_MSG_CHECKING([whether email keyserver support is requested])
@ -526,12 +526,17 @@ fi
if test x"$try_http" = xyes ; then if test x"$try_http" = xyes ; then
AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT") AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT")
AC_DEFINE(HTTP_SUPPORT,1,[Define to include HTTP support])
fi fi
if test x"$try_finger" = xyes ; then if test x"$try_finger" = xyes ; then
AC_SUBST(GPGKEYS_FINGER,"gpgkeys_finger$EXEEXT") AC_SUBST(GPGKEYS_FINGER,"gpgkeys_finger$EXEEXT")
fi 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 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 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 dnl ELF runtime link paths), then link will fail and LDAP support won't
@ -648,12 +653,17 @@ AC_SUBST(GPGKEYS_LDAP)
AC_SUBST(LDAPLIBS) AC_SUBST(LDAPLIBS)
AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "") AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "")
if test "$try_ftp" = yes ; then dnl If we have neither FTP or HTTP defined, then don't bother to check
GNUPG_CHECK_LIBCURL dnl for curl.
if test x"$have_libcurl" = xyes ; then if test "$try_ftp" = yes || test "$try_http" = yes ; then
AC_SUBST(GPGKEYS_FTP,"gpgkeys_ftp$EXEEXT") GNUPG_CHECK_LIBCURL
fi fi
AM_CONDITIONAL(HAVE_LIBCURL, test "$have_libcurl" = "yes")
if test x"$have_libcurl" = xyes ; then
AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
fi fi
dnl This isn't necessarily sendmail itself, but anything that gives a dnl This isn't necessarily sendmail itself, but anything that gives a