mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 04:17:50 +08:00
76 lines
3.3 KiB
Diff
76 lines
3.3 KiB
Diff
|
--- a/configure 2017-11-01 23:55:49.000000000 +0100
|
||
|
|
+++ b/configure 2019-03-05 03:35:21.753268300 +0100
|
||
|
|
@@ -5989,13 +5989,13 @@
|
||
|
|
|
||
|
|
# use_openssl="yes" given explicitly in next 2 rules to avoid adding lib to $LIBS
|
||
|
|
if test "$use_openssl" = "yes"; then
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_int_ctrl in -lcrypto" >&5
|
||
|
|
-$as_echo_n "checking for BIO_int_ctrl in -lcrypto... " >&6; }
|
||
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_int_ctrl in -llibeay32" >&5
|
||
|
|
+$as_echo_n "checking for BIO_int_ctrl in -llibeay32... " >&6; }
|
||
|
|
if ${ac_cv_lib_crypto_BIO_int_ctrl+:} false; then :
|
||
|
|
$as_echo_n "(cached) " >&6
|
||
|
|
else
|
||
|
|
ac_check_lib_save_LIBS=$LIBS
|
||
|
|
-LIBS="-lcrypto $LIBS"
|
||
|
|
+LIBS="-llibeay32 $LIBS"
|
||
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
/* end confdefs.h. */
|
||
|
|
|
||
|
|
@@ -6030,23 +6030,23 @@
|
||
|
|
else
|
||
|
|
use_openssl="no"
|
||
|
|
if test "$with_openssl" = "yes"; then
|
||
|
|
- as_fn_error $? "OpenSSL was explicitly requested but libcrypto was not found. Try the --with-openssl=DIR argument to give the location of OpenSSL or run configure with --without-openssl." "$LINENO" 5
|
||
|
|
+ as_fn_error $? "OpenSSL was explicitly requested but libeay32 was not found. Try the --with-openssl=DIR argument to give the location of OpenSSL or run configure with --without-openssl." "$LINENO" 5
|
||
|
|
fi
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find libcrypto so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument" >&5
|
||
|
|
-$as_echo "$as_me: WARNING: Failed to find libcrypto so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument" >&2;}
|
||
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed to find libeay32 so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument" >&5
|
||
|
|
+$as_echo "$as_me: WARNING: Failed to find libeay32 so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument" >&2;}
|
||
|
|
|
||
|
|
fi
|
||
|
|
|
||
|
|
fi
|
||
|
|
|
||
|
|
if test "$use_openssl" = "yes"; then
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
|
||
|
|
-$as_echo_n "checking for SSL_new in -lssl... " >&6; }
|
||
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssleay32" >&5
|
||
|
|
+$as_echo_n "checking for SSL_new in -lssleay32... " >&6; }
|
||
|
|
if ${ac_cv_lib_ssl_SSL_new+:} false; then :
|
||
|
|
$as_echo_n "(cached) " >&6
|
||
|
|
else
|
||
|
|
ac_check_lib_save_LIBS=$LIBS
|
||
|
|
-LIBS="-lssl -lcrypto $LIBS"
|
||
|
|
+LIBS="-lssleay32 -llibeay32 $LIBS"
|
||
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
/* end confdefs.h. */
|
||
|
|
|
||
|
|
@@ -6090,13 +6090,13 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
if test "$use_openssl" = "yes"; then
|
||
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_PKEY_get1_EC_KEY in -lcrypto" >&5
|
||
|
|
-$as_echo_n "checking for EVP_PKEY_get1_EC_KEY in -lcrypto... " >&6; }
|
||
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_PKEY_get1_EC_KEY in -llibeay32" >&5
|
||
|
|
+$as_echo_n "checking for EVP_PKEY_get1_EC_KEY in -llibeay32... " >&6; }
|
||
|
|
if ${ac_cv_lib_crypto_EVP_PKEY_get1_EC_KEY+:} false; then :
|
||
|
|
$as_echo_n "(cached) " >&6
|
||
|
|
else
|
||
|
|
ac_check_lib_save_LIBS=$LIBS
|
||
|
|
-LIBS="-lcrypto $LIBS"
|
||
|
|
+LIBS="-llibeay32 $LIBS"
|
||
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||
|
|
/* end confdefs.h. */
|
||
|
|
|
||
|
|
@@ -6144,7 +6144,7 @@
|
||
|
|
|
||
|
|
$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
|
||
|
|
|
||
|
|
- OPENSSL_LIBS="-lssl -lcrypto"
|
||
|
|
+ OPENSSL_LIBS="-lssleay32 -llibeay32"
|
||
|
|
else
|
||
|
|
trace_no_use="$trace_no_use openssl"
|
||
|
|
fi
|