Module: wine Branch: master Commit: 8354e6a93a9b4c11f9d54a6ac40d11cf31c97741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8354e6a93a9b4c11f9d54a6ac4...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 13 10:42:54 2008 +0200
configure: Improve the libcrypto checks.
---
configure | 2 +- configure.ac | 2 +- dlls/wininet/netconnection.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure index 4bad30e..2419218 100755 --- a/configure +++ b/configure @@ -15818,7 +15818,7 @@ _ACEOF fi
fi -if test "x$ac_cv_lib_soname_ssl" = "x"; then +if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then case "x$with_openssl" in x) wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;; xno) ;; diff --git a/configure.ac b/configure.ac index 33562e3..e61f68d 100644 --- a/configure.ac +++ b/configure.ac @@ -1171,7 +1171,7 @@ then WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) fi -WINE_NOTICE_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x"], +WINE_NOTICE_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"], [OpenSSL development files not found, SSL won't be supported.])
dnl **** Check for libjpeg **** diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 63f3f8e..9cd7917 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -119,7 +119,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) connection->socketFD = -1; if (useSSL) { -#ifdef SONAME_LIBSSL +#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) TRACE("using SSL connection\n"); if (OpenSSL_ssl_handle) /* already initialized everything */ return TRUE;