diff options
| author | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
| commit | 7c730a573a7e239f41bc619b024a675667767428 (patch) | |
| tree | 1265ca1ddae47b094af21f669d0526c9c1b074dd /erts/configure.in | |
| parent | 13fcdd5c954ddbb8ac9401d73f8e77423fbd976c (diff) | |
| parent | e84f232326b2800ca806c867b2bfbe3652d423cb (diff) | |
| download | otp-7c730a573a7e239f41bc619b024a675667767428.tar.gz otp-7c730a573a7e239f41bc619b024a675667767428.tar.bz2 otp-7c730a573a7e239f41bc619b024a675667767428.zip | |
Merge branch 'dev' of super:otp into bmk/inets/inets571_integration
Diffstat (limited to 'erts/configure.in')
| -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" |