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 openssl detection under Windows.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-04-04 00:13:53 +02:00
parent b1acde223f
commit 1cba1a7659
6 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-04 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Use AC_CHECK_LIB to look for the openssl library.
2011-04-03 Giuseppe Scrivano <gscrivano@gnu.org>
* bootstrap.conf (gnulib_modules): Add `fcntl'.

27
configure.ac
View File

@ -223,11 +223,12 @@ WGET_NSL_SOCKET
dnl Deal with specific hosts
case $host_os in
*mingw32* )
AC_SUBST(W32LIBS, '-lws2_32 -lgdi32')
LIBS+='-lws2_32 -lgdi32'
AC_LIBOBJ([mswindows])
;;
esac
dnl
dnl Checks for libraries.
dnl
@ -241,29 +242,17 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_CHECK_LIB(dl, shl_load)
])
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])
elif test x"$with_ssl" != x
then
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
fi
AC_CHECK_LIB(z, compress)
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_LIBOBJ([openssl])
], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [
dnl Now actually check for -lssl
AC_CHECK_LIB(z, compress)
AC_CHECK_LIB(gpg-error, gpg_err_init)
AC_CHECK_LIB(gcrypt, gcry_control)
AC_CHECK_LIB(gnutls, main)

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-04 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (LIBS): Remove @LIBSSL@ @W32LIBS@
2011-04-03 Giuseppe Scrivano <gscrivano@gnu.org>
* gnutls.c: Include <fcntl.h>.

2
src/Makefile.am
View File

@ -37,7 +37,7 @@ endif
# The following line is losing on some versions of make!
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
LIBS = @LIBSSL@ @LIBICONV@ @LIBINTL@ @LIBS@ @W32LIBS@
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@
bin_PROGRAMS = wget
wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \

4
tests/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-04 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (LIBS): Remove @LIBSSL@ @W32LIBS@
2010-10-23 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (LIBS): Remove @LIBGNUTLS@ and use @W32LIBS@ as last

2
tests/Makefile.am
View File

@ -34,7 +34,7 @@
PERL = perl
PERLRUN = $(PERL) -I$(srcdir)
LIBS = @LIBSSL@ @LIBICONV@ @LIBINTL@ @LIBS@ @W32LIBS@
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@
.PHONY: test run-unit-tests run-px-tests