moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

By default use GNU TLS not OpenSSL.

This commit is contained in:
Giuseppe Scrivano 2010-06-22 22:33:38 +02:00
parent a6625c97c5
commit 4c73a8fc26
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-06-22 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: By default use GNU TLS not OpenSSL.
2010-06-17 Giuseppe Scrivano <gscrivano@gnu.org>
* windows: Remove directory.

34
configure.ac
View File

@ -232,21 +232,7 @@ dnl
dnl Checks for libraries.
dnl
AS_IF([test x"$with_ssl" = xgnutls], [
dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h>
], [gnutls_global_init()])
if test x"$LIBGNUTLS" != x
then
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
AC_LIBOBJ([gnutls])
else
AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
fi
], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [
AS_IF([test x"$with_ssl" = xopenssl], [
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
dnl doesn't record its dependency on libdl, so we need to make sure
dnl -ldl ends up in LIBS on systems that have it. Most OSes use
@ -271,10 +257,24 @@ AS_IF([test x"$with_ssl" = xgnutls], [
AC_LIBOBJ([openssl])
elif test x"$with_ssl" != x
then
AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
fi
], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [
dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h>
], [gnutls_global_init()])
if test x"$LIBGNUTLS" != x
then
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
AC_LIBOBJ([gnutls])
else
AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
fi
]) # endif: --with-ssl == no?
]) # endif: --with-ssl == gnutls?
]) # endif: --with-ssl == openssl?
dnl Enable NTLM if requested and if SSL is available.