diff options
| author | Henrik Nord <[email protected]> | 2011-09-08 16:36:26 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-08 16:36:26 +0200 |
| commit | f602ae4f0c727c1ff37e69887ba33f46b24c54e1 (patch) | |
| tree | 340525e4b69e6971854de896b4f64d70b2224b0a /erts/configure.in | |
| parent | 6fae573fc291f4a77282b918cae346064bece80e (diff) | |
| parent | 262a9af33d3ceb4cb032c434b100cea7d4b0d60e (diff) | |
| download | otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.gz otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.bz2 otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.zip | |
Merge branch 'dev' into major
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 3dbf98b876..88337e79fd 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" |