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

Under mingw don't check for different OpenSSL when one is found.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-08-26 12:35:12 +02:00
parent 5e3c9b55f2
commit baed30f057
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-08-26 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Under mingw don't check for static OpenSSL
libraries if the shared version was already found.
Suggested by: Ray Satiro <raysatiro@yahoo.com>.
2011-08-25 Giuseppe Scrivano <gscrivano@gnu.org> 2011-08-25 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Check for `utime'. * configure.ac: Check for `utime'.

17
configure.ac
View File

@ -246,6 +246,7 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_CHECK_LIB(dl, shl_load) AC_CHECK_LIB(dl, shl_load)
]) ])
ssl_found=no
case $host_os in case $host_os in
*mingw32* ) *mingw32* )
dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error dnl prefer link to openssl dlls if possible. if not then fallback on static libs. if not then error
@ -253,9 +254,11 @@ AS_IF([test x"$with_ssl" = xopenssl], [
AC_CHECK_LIB(eay32, EVP_MD_CTX_init) AC_CHECK_LIB(eay32, EVP_MD_CTX_init)
if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno if test x"$ac_cv_lib_eay32_EVP_MD_CTX_init" != xno
then then
AC_CHECK_LIB(ssl32, SSL_connect,, AC_CHECK_LIB(ssl32, SSL_connect, [
AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found])) ssl_found=yes
AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)]) AC_MSG_NOTICE([Enabling support for SSL via OpenSSL (shared)])
],
AC_MSG_ERROR([openssl not found: shared lib eay32 found but ssl32 not found]))
else else
LIBS+=' -lgdi32' LIBS+=' -lgdi32'
@ -265,7 +268,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
;; ;;
esac esac
dnl Now actually check for -lssl 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], [ AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@ -286,6 +291,9 @@ AS_IF([test x"$with_ssl" = xopenssl], [
fi fi
AC_LIBOBJ([openssl]) AC_LIBOBJ([openssl])
])
], [ ], [
# --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], [
@ -312,7 +320,6 @@ AS_IF([test x"$with_ssl" = xopenssl], [
]) # endif: --with-ssl == no? ]) # endif: --with-ssl == no?
]) # endif: --with-ssl == openssl? ]) # endif: --with-ssl == openssl?
dnl Enable NTLM if requested and if SSL is available. dnl Enable NTLM if requested and if SSL is available.
if test x"$LIBSSL" != x if test x"$LIBSSL" != x
then then