security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

* configure.ac: Remove --disable-old-hkp - use new HKP handler for

Browse Source 
--with-libcurl or --enable-fake-curl.
This commit is contained in:
David Shaw 2005-04-17 00:06:04 +00:00
parent d8e1f7656b
commit 352db25580
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-04-16 David Shaw <dshaw@jabberwocky.com> 2005-04-16 David Shaw <dshaw@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 * configure.ac: Add --disable-old-hkp option that can be used
along with --with-libcurl to build the curl version of HKP. along with --with-libcurl to build the curl version of HKP.

14
configure.ac
View File

@ -628,14 +628,14 @@ if test x"$fake_curl" = xyes ; then
else else
# If we have neither FTP or HTTP defined, then don't bother to check # If we have neither FTP or HTTP defined, then don't bother to check
# for curl. # for curl.
if test x"$try_ftp" = xyes || test x"$try_http" = xyes ; then if test x"$try_hkp" = xyes || test x"$try_ftp" = xyes || test x"$try_http" = xyes ; then
LIBCURL_CHECK_CONFIG([no]) LIBCURL_CHECK_CONFIG([no],,[with_curl=yes])
fi fi
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"$try_http" = xyes ; then
if test x$libcurl_protocol_HTTP = xyes ; then if test x$libcurl_protocol_HTTP = xyes ; then
@ -644,17 +644,11 @@ if test x"$try_http" = xyes ; then
if test x$libcurl_protocol_HTTPS = xyes ; then if test x$libcurl_protocol_HTTPS = xyes ; then
AC_DEFINE(HTTPS_VIA_LIBCURL,1,[Define if HTTPS is handled via libcurl]) AC_DEFINE(HTTPS_VIA_LIBCURL,1,[Define if HTTPS is handled via libcurl])
fi 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 else
AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT") AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT")
fi fi
fi fi
AM_CONDITIONAL(OLD_HKP,test x"$old_hkp" != xno)
# Are we doing FTP? We only do FTP if we have libcurl. # 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 if test x"$try_ftp" = xyes && test x$libcurl_protocol_FTP = xyes ; then