mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Fix build under mingw when OpenSSL is used.
This commit is contained in:
parent
b3014041c5
commit
44ea82bc67
@ -1,3 +1,7 @@
|
||||
2012-03-25 Ray Satiro <raysatiro@yahoo.com>
|
||||
|
||||
* configure.ac: Fix build under mingw when OpenSSL is used.
|
||||
|
||||
2012-03-20 Ángel González <keisial@gmail.com>
|
||||
|
||||
* bootstrap.conf (gnulib_modules): Add modules `ftello',
|
||||
|
10
configure.ac
10
configure.ac
@ -264,6 +264,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
|
||||
AC_CHECK_LIB(ssl32, SSL_connect, [
|
||||
ssl_found=yes
|
||||
AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
|
||||
AC_LIBOBJ([openssl])
|
||||
LIBS="${LIBS} -lssl32"
|
||||
AC_DEFINE([HAVE_LIBSSL32], [1], [Define to 1 if you have the `ssl32' library (-lssl32).])
|
||||
],
|
||||
AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
|
||||
|
||||
@ -289,6 +292,7 @@ AS_IF([test x$ssl_found != xyes],
|
||||
], [SSL_library_init ()])
|
||||
if test x"$LIBSSL" != x
|
||||
then
|
||||
ssl_found=yes
|
||||
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
|
||||
AC_LIBOBJ([openssl])
|
||||
LIBS="$LIBSSL $LIBS"
|
||||
@ -296,9 +300,6 @@ AS_IF([test x$ssl_found != xyes],
|
||||
then
|
||||
AC_MSG_ERROR([--with-ssl=openssl was given, but SSL is not available.])
|
||||
fi
|
||||
|
||||
AC_LIBOBJ([openssl])
|
||||
|
||||
])
|
||||
|
||||
], [
|
||||
@ -316,6 +317,7 @@ AS_IF([test x$ssl_found != xyes],
|
||||
], [gnutls_global_init()])
|
||||
if test x"$LIBGNUTLS" != x
|
||||
then
|
||||
ssl_found=yes
|
||||
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
|
||||
AC_LIBOBJ([gnutls])
|
||||
LIBS="$LIBGNUTLS $LIBS"
|
||||
@ -328,7 +330,7 @@ AS_IF([test x$ssl_found != xyes],
|
||||
]) # endif: --with-ssl == openssl?
|
||||
|
||||
dnl Enable NTLM if requested and if SSL is available.
|
||||
if test x"$LIBSSL" != x
|
||||
if test x"$LIBSSL" != x || test "$ac_cv_lib_ssl32_SSL_connect" = yes
|
||||
then
|
||||
if test x"$ENABLE_NTLM" != xno
|
||||
then
|
||||
|
@ -1,3 +1,8 @@
|
||||
2012-03-25 Ray Satiro <raysatiro@yahoo.com>
|
||||
|
||||
* build_info.c.in: Check that HAVE_LIBSSL32 is defined when OpenSSL
|
||||
is used.
|
||||
|
||||
2012-03-07 Steven Schubiger <stsc@member.fsf.org>
|
||||
|
||||
* init.c (wgetrc_user_file_name): Correct typo.
|
||||
|
@ -9,5 +9,5 @@ ntlm defined ENABLE_NTLM
|
||||
opie defined ENABLE_OPIE
|
||||
|
||||
ssl choice:
|
||||
openssl defined HAVE_LIBSSL
|
||||
openssl defined HAVE_LIBSSL || defined HAVE_LIBSSL32
|
||||
gnutls defined HAVE_LIBGNUTLS
|
||||
|
Loading…
Reference in New Issue
Block a user