Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0

into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.ssl


acinclude.m4:
  Auto merged

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
       ;;