configure: Improve the libcrypto checks.
This commit is contained in:
parent
954d6e2ed9
commit
8354e6a93a
|
@ -15818,7 +15818,7 @@ _ACEOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
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
|
case "x$with_openssl" in
|
||||||
x) wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;;
|
x) wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;;
|
||||||
xno) ;;
|
xno) ;;
|
||||||
|
|
|
@ -1171,7 +1171,7 @@ then
|
||||||
WINE_CHECK_SONAME(ssl,SSL_library_init)
|
WINE_CHECK_SONAME(ssl,SSL_library_init)
|
||||||
WINE_CHECK_SONAME(crypto,BIO_new_socket)
|
WINE_CHECK_SONAME(crypto,BIO_new_socket)
|
||||||
fi
|
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.])
|
[OpenSSL development files not found, SSL won't be supported.])
|
||||||
|
|
||||||
dnl **** Check for libjpeg ****
|
dnl **** Check for libjpeg ****
|
||||||
|
|
|
@ -119,7 +119,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL)
|
||||||
connection->socketFD = -1;
|
connection->socketFD = -1;
|
||||||
if (useSSL)
|
if (useSSL)
|
||||||
{
|
{
|
||||||
#ifdef SONAME_LIBSSL
|
#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO)
|
||||||
TRACE("using SSL connection\n");
|
TRACE("using SSL connection\n");
|
||||||
if (OpenSSL_ssl_handle) /* already initialized everything */
|
if (OpenSSL_ssl_handle) /* already initialized everything */
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
Loading…
Reference in New Issue