mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Fix openssl detection under Windows.
This commit is contained in:
parent
b1acde223f
commit
1cba1a7659
@ -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>
|
2011-04-03 Giuseppe Scrivano <gscrivano@gnu.org>
|
||||||
|
|
||||||
* bootstrap.conf (gnulib_modules): Add `fcntl'.
|
* bootstrap.conf (gnulib_modules): Add `fcntl'.
|
||||||
|
27
configure.ac
27
configure.ac
@ -223,11 +223,12 @@ WGET_NSL_SOCKET
|
|||||||
dnl Deal with specific hosts
|
dnl Deal with specific hosts
|
||||||
case $host_os in
|
case $host_os in
|
||||||
*mingw32* )
|
*mingw32* )
|
||||||
AC_SUBST(W32LIBS, '-lws2_32 -lgdi32')
|
LIBS+='-lws2_32 -lgdi32'
|
||||||
AC_LIBOBJ([mswindows])
|
AC_LIBOBJ([mswindows])
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Checks for libraries.
|
dnl Checks for libraries.
|
||||||
dnl
|
dnl
|
||||||
@ -241,29 +242,17 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
|||||||
AC_CHECK_LIB(dl, shl_load)
|
AC_CHECK_LIB(dl, shl_load)
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl Now actually check for -lssl
|
AC_CHECK_LIB(z, compress)
|
||||||
AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
|
AC_CHECK_LIB(crypto, EVP_MD_CTX_init)
|
||||||
#include <openssl/ssl.h>
|
AC_CHECK_LIB(ssl, ERR_func_error_string,,
|
||||||
#include <openssl/x509.h>
|
AC_MSG_ERROR([openssl development libraries not found]))
|
||||||
#include <openssl/err.h>
|
AC_LIBOBJ([openssl])
|
||||||
#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
|
|
||||||
], [
|
], [
|
||||||
# --with-ssl is not gnutls: check if it's no
|
# --with-ssl is not gnutls: check if it's no
|
||||||
AS_IF([test x"$with_ssl" != xno], [
|
AS_IF([test x"$with_ssl" != xno], [
|
||||||
dnl Now actually check for -lssl
|
dnl Now actually check for -lssl
|
||||||
|
|
||||||
|
AC_CHECK_LIB(z, compress)
|
||||||
AC_CHECK_LIB(gpg-error, gpg_err_init)
|
AC_CHECK_LIB(gpg-error, gpg_err_init)
|
||||||
AC_CHECK_LIB(gcrypt, gcry_control)
|
AC_CHECK_LIB(gcrypt, gcry_control)
|
||||||
AC_CHECK_LIB(gnutls, main)
|
AC_CHECK_LIB(gnutls, main)
|
||||||
|
@ -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>
|
2011-04-03 Giuseppe Scrivano <gscrivano@gnu.org>
|
||||||
|
|
||||||
* gnutls.c: Include <fcntl.h>.
|
* gnutls.c: Include <fcntl.h>.
|
||||||
|
@ -37,7 +37,7 @@ endif
|
|||||||
|
|
||||||
# The following line is losing on some versions of make!
|
# The following line is losing on some versions of make!
|
||||||
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
|
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
|
||||||
LIBS = @LIBSSL@ @LIBICONV@ @LIBINTL@ @LIBS@ @W32LIBS@
|
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@
|
||||||
|
|
||||||
bin_PROGRAMS = wget
|
bin_PROGRAMS = wget
|
||||||
wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \
|
wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \
|
||||||
|
@ -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>
|
2010-10-23 Giuseppe Scrivano <gscrivano@gnu.org>
|
||||||
|
|
||||||
* Makefile.am (LIBS): Remove @LIBGNUTLS@ and use @W32LIBS@ as last
|
* Makefile.am (LIBS): Remove @LIBGNUTLS@ and use @W32LIBS@ as last
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
PERL = perl
|
PERL = perl
|
||||||
PERLRUN = $(PERL) -I$(srcdir)
|
PERLRUN = $(PERL) -I$(srcdir)
|
||||||
|
|
||||||
LIBS = @LIBSSL@ @LIBICONV@ @LIBINTL@ @LIBS@ @W32LIBS@
|
LIBS = @LIBICONV@ @LIBINTL@ @LIBS@
|
||||||
|
|
||||||
.PHONY: test run-unit-tests run-px-tests
|
.PHONY: test run-unit-tests run-px-tests
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user