summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-10-07 15:42:26 +0300
committermonty@narttu.mysql.fi <>2003-10-07 15:42:26 +0300
commit6056cfadfcb07cda12f6dc01ec9c1ab07067ac69 (patch)
treed89c080ef636608e316f1166b1628cd1d902deec /acinclude.m4
parent0091fa2e3266da6a17b0615a4696c25a4d36d664 (diff)
parent446d40e880c0e6ab6ac56b0082d4883ef5c7d467 (diff)
downloadmariadb-git-6056cfadfcb07cda12f6dc01ec9c1ab07067ac69.tar.gz
Merge with 4.0.16
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 577adba5769..15a6abc38d4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -879,9 +879,10 @@ AC_MSG_CHECKING(for OpenSSL)
echo "You can't use the --all-static link option when using openssl."
exit 1
fi
+ NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"
+ else
AC_MSG_RESULT(no)
fi
- NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"
AC_SUBST(openssl_libs)
AC_SUBST(openssl_includes)
])