summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorgluh@gluh.mysql.r18.ru <>2003-12-10 18:41:12 +0400
committergluh@gluh.mysql.r18.ru <>2003-12-10 18:41:12 +0400
commit9b472debb4331543e22973a90b53920c16daa0e8 (patch)
tree7814446195e1b34537189768848ffcc9093535c4 /acinclude.m4
parent980345345e01c7c62ebdc140b495614760034b60 (diff)
parent194da99215cc7d0214415cb4f484f0f4176e4d5f (diff)
downloadmariadb-git-9b472debb4331543e22973a90b53920c16daa0e8.tar.gz
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.ssl
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index f7833bdce41..8a92048f9ab 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -745,7 +745,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib /usr/local/lib/ ; do
- if test -f $d/libssl.a ; then
+ if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then
OPENSSL_LIB=$d
fi
done
@@ -757,7 +757,7 @@ AC_DEFUN(MYSQL_FIND_OPENSSL, [
if test -f $incs/openssl/ssl.h ; then
OPENSSL_INCLUDE=-I$incs
fi
- if test -f $libs/libssl.a ; then
+ if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then
OPENSSL_LIB=$libs
fi
;;