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

fix bug #39844

Browse Source
This commit is contained in:
Tim Ruehsen 2013-09-13 15:51:20 +02:00 committed by Giuseppe Scrivano
parent 85dd2f7ce2
commit 7e85e9509e
2 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2013-09-13 Tim Ruehsen <tim.ruehsen@gmx.de>
* configure.ac: added a summary of build options
fixed some indentations
removed the unconditionally adding of libz with --with-ssl
removed -lgcrypt and -lgpg-error for gnutls
2013-07-23 Tim Ruehsen <tim.ruehsen@gmx.de>
* configure.ac: Remove AM_CONDITIONAL HAVE_NETTLE.

59
configure.ac
View File

@ -238,13 +238,11 @@ dnl Checks for libraries.
dnl
AS_IF([test x"$with_zlib" != xno], [
with_zlib=yes
AC_CHECK_LIB(z, compress)
])
AS_IF([test x"$with_ssl" = xopenssl], [
dnl some versions of openssl use zlib compression
AC_CHECK_LIB(z, compress)
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
@ -278,17 +276,16 @@ AS_IF([test x"$with_ssl" = xopenssl], [
;;
esac
AS_IF([test x$ssl_found != xyes],
[
AS_IF([test x$ssl_found != xyes], [
dnl Now actually check for -lssl if it wasn't already found
AC_LIB_HAVE_LINKFLAGS([ssl], [crypto z], [
#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>
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
@ -300,18 +297,15 @@ AS_IF([test x$ssl_found != xyes],
then
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
fi
])
])
], [
# --with-ssl is not gnutls: check if it's no
# --with-ssl is not openssl: check if it's no
AS_IF([test x"$with_ssl" != xno], [
dnl Now actually check for -lssl
dnl default is -lgnutls
with_ssl=gnutls
AC_CHECK_LIB(z, compress)
AC_CHECK_LIB(gpg-error, gpg_err_init)
AC_CHECK_LIB(gcrypt, gcry_control)
dnl Now actually check for -lssl
dnl Now actually check for -lgnutls
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h>
], [gnutls_global_init()])
@ -322,11 +316,11 @@ AS_IF([test x$ssl_found != xyes],
AC_LIBOBJ([gnutls])
LIBS="$LIBGNUTLS $LIBS"
else
AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
fi
AC_CHECK_FUNCS(gnutls_priority_set_direct)
]) # endif: --with-ssl == no?
]) # endif: --with-ssl != no?
]) # endif: --with-ssl == openssl?
dnl Enable NTLM if requested and if SSL is available.
@ -334,6 +328,7 @@ if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes
then
if test x"$ENABLE_NTLM" != xno
then
ENABLE_NTLM=yes
AC_DEFINE([ENABLE_NTLM], 1,
[Define if you want the NTLM authorization support compiled in.])
AC_LIBOBJ([http-ntlm])
@ -347,6 +342,7 @@ else
AC_DEFINE([HAVE_NETTLE], [1], [Use libnettle])
if test x"$ENABLE_NTLM" != xno
then
ENABLE_NTLM=yes
AC_DEFINE([ENABLE_NTLM], 1,
[Define if you want the NTLM authorization support compiled in.])
AC_LIBOBJ([http-ntlm])
@ -572,3 +568,20 @@ AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile util/Makefile
lib/Makefile])
AC_CONFIG_HEADERS([src/config.h])
AC_OUTPUT
AC_MSG_NOTICE([Summary of build options:
Version: $PACKAGE_VERSION
Host OS: $host_os
Install prefix: $prefix
Compiler: $CC
CFlags: $CFLAGS $CPPFLAGS
LDFlags: $LDFLAGS
Libs: $LIBS
SSL: $with_ssl
Zlib: $with_zlib
Digest: $ENABLE_DIGEST
NTLM: $ENABLE_NTLM
OPIE: $ENABLE_OPIE
Debugging: $ENABLE_DEBUG
])