aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-02-19 16:06:23 +0100
committerLukas Larsson <[email protected]>2014-02-24 15:16:08 +0100
commit7687e5b3c015b4ac54914137ffed951100ebc9af (patch)
tree82a94f52c5d91398fc618a7dfb3e795eb46d7cc4
parent2c20bdf2e146dbe27554be7f02982b503ecf08d5 (diff)
downloadotp-7687e5b3c015b4ac54914137ffed951100ebc9af.tar.gz
otp-7687e5b3c015b4ac54914137ffed951100ebc9af.tar.bz2
otp-7687e5b3c015b4ac54914137ffed951100ebc9af.zip
ose: Fix ssl configure test for osx
-rw-r--r--erts/configure.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 7ef29bd959..142e3a3ad7 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4196,8 +4196,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
fi
if test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.a"; then
SSL_DYNAMIC_ONLY=yes
- fi
- if test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.so"; then
+ elif test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.so" -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
SSL_STATIC_ONLY=yes
fi
SSL_BINDIR="$rdir/bin"
@@ -4379,10 +4378,9 @@ dnl so it is - be adoptable
else
SSL_LIBDIR="$with_ssl/lib"
fi
- if test '!' -f $SSL_LIBDIR/libcrypto.a; then
+ if test '!' -f "${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"; then
SSL_DYNAMIC_ONLY=yes
- fi
- if test '!' -f $SSL_LIBDIR/libcrypto.so; then
+ elif test '!' -f ${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.so -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
SSL_STATIC_ONLY=yes
fi
SSL_INCLUDE="-I$with_ssl/include"