moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

allow --with-libgnutls-prefix and --with-libssl-prefix.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-08-11 12:07:32 +02:00
parent 76c651e3a1
commit f3c2686ef7
3 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,15 +1,19 @@
2011-08-11 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Allow --with-libgnutls-prefix and
--with-libssl-prefix
Suggested by: Karl Berry <karl@freefriends.org>
* build-aux/bzr-version-gen (TAG): Consider only the last tag.
2011-08-10 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Print usage string for --with-ssl.
Reported by: Karl Berry<karl@freefriends.org>
Reported by: Karl Berry <karl@freefriends.org>
* configure.ac: Check for `gnutls_priority_set_direct' when gnutls is
used.
Reported by: Karl Berry<karl@freefriends.org>
Reported by: Karl Berry <karl@freefriends.org>
2011-08-09 Giuseppe Scrivano <gscrivano@southpole.se>

46
configure.ac
View File

@ -260,27 +260,31 @@ AS_IF([test x"$with_ssl" = xopenssl], [
else
LIBS+=' -lgdi32'
dnl fallback and test static libs
AC_CHECK_LIB(crypto, EVP_MD_CTX_init,,,)
if test x"$ac_cv_lib_crypto_EVP_MD_CTX_init" != xno
then
AC_CHECK_LIB(ssl, SSL_connect,, AC_MSG_ERROR([openssl not found]))
AC_MSG_NOTICE([Enabling support for SSL via OpenSSL])
else
AC_MSG_ERROR([openssl not found: shared (eay32/ssl32) or static (crypto/ssl) libs needed])
fi
fi
dnl add zdll lib as dep for above tests?
;;
*)
AC_CHECK_LIB(crypto, EVP_MD_CTX_init)
AC_CHECK_LIB(ssl, ERR_func_error_string,,
AC_MSG_ERROR([openssl development libraries not found]))
AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (static)])
;;
esac
dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/des.h>
#include <openssl/md4.h>
#include <openssl/md5.h>
], [SSL_library_init ()])
if test x"$LIBSSL" != x
then
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
AC_LIBOBJ([openssl])
LIBS="-lopenssl $LIBS"
elif test x"$with_ssl" != x
then
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
fi
AC_LIBOBJ([openssl])
], [
# --with-ssl is not gnutls: check if it's no
@ -290,12 +294,16 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_CHECK_LIB(z, compress)
AC_CHECK_LIB(gpg-error, gpg_err_init)
AC_CHECK_LIB(gcrypt, gcry_control)
AC_CHECK_LIB(gnutls, main)
if test x"$ac_cv_lib_gnutls_main" != 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])
LIBS="-lgnutls $LIBS"
else
AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
fi

2
src/ChangeLog
View File

@ -11,7 +11,7 @@
* gnutls.c (ssl_connect_wget)
[HAVE_GNUTLS_PRIORITY_SET_DIRECT]: Use gnutls_priority_set_direct.
[! HAVE_GNUTLS_PRIORITY_SET_DIRECT]: Use gnutls_protocol_set_priority.
Reported by: Karl Berry<karl@freefriends.org>
Reported by: Karl Berry <karl@freefriends.org>
2011-08-06 Jochen Roderburg <Roderburg@Uni-Koeln.DE>