Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/usr/home/ram/work/mysql-4.1

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-4.1
cc953ed3 · unknown · e86e844f · b1a1b481 · cc953ed3
Commit cc953ed3 authored Nov 01, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

acinclude.m4 acinclude.m4 +3 -2

No files found.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -310,8 +310,9 @@ case $SYSTEM_TYPE in
        fi
        ;;
      *)
-        if test -f "$mysql_zlib_dir/lib/libz.a" -a \ 
-                -f "$mysql_zlib_dir/include/zlib.h"; then
+        if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \
+                   -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \
+                -a -f "$mysql_zlib_dir/include/zlib.h"; then
          ZLIB_INCLUDES="-I$mysql_zlib_dir/include"
          ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
          MYSQL_CHECK_ZLIB_DIR