diff options
| author | Henrik Nord <[email protected]> | 2011-09-08 16:32:59 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-08 16:33:03 +0200 |
| commit | 2ee4aed839aa63243e2c12694822cfdef7c4ea60 (patch) | |
| tree | 4626128716280463434c9ee424a7a98be9e44b7a /erts | |
| parent | d3d5a066f06509fa7546443bf841d07167c5fb60 (diff) | |
| parent | 52230a417ad005711876132d144b3fe8a72d7e8e (diff) | |
| download | otp-2ee4aed839aa63243e2c12694822cfdef7c4ea60.tar.gz otp-2ee4aed839aa63243e2c12694822cfdef7c4ea60.tar.bz2 otp-2ee4aed839aa63243e2c12694822cfdef7c4ea60.zip | |
Merge branch 'dc/fix_win32_static_crypto' into dev
* dc/fix_win32_static_crypto:
Fix win32 OpenSSL static linking broken in 20c9d6e
OTP-9532
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in index d4298caf11..03e27c9dad 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3725,7 +3725,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in SSL_RUNTIME_LIBDIR="$rdir/lib" SSL_LIBDIR="$dir/lib" SSL_CRYPTO_LIBNAME=libeay32 - SSL_CRYPTO_LIBNAME=ssleay32 + SSL_SSL_LIBNAME=ssleay32 elif test -f "$dir/lib/openssl.lib"; then SSL_RUNTIME_LIBDIR="$rdir/lib" SSL_LIBDIR="$dir/lib" @@ -3907,7 +3907,7 @@ dnl so it is - be adoptable elif test -f "$with_ssl/lib/libeay32.lib"; then SSL_LIBDIR="$with_ssl/lib" SSL_CRYPTO_LIBNAME=libeay32 - SSL_CRYPTO_LIBNAME=ssleay32 + SSL_SSL_LIBNAME=ssleay32 else # This probably wont work, but that's what the user said, so... SSL_LIBDIR="$with_ssl/lib" |