From 7687e5b3c015b4ac54914137ffed951100ebc9af Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Wed, 19 Feb 2014 16:06:23 +0100 Subject: ose: Fix ssl configure test for osx --- erts/configure.in | 8 +++----- 1 file 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" -- cgit v1.2.3