Merge mysql.com:/M50/bug6584 into mysql.com:/M51/merge-5.1

39e75d81 · unknown · 867a5b54 · dced9348 · 39e75d81
Commit 39e75d81 authored Nov 09, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

config/ac-macros/zlib.m4 config/ac-macros/zlib.m4 +3 -2

No files found.
--- a/config/ac-macros/zlib.m4
+++ b/config/ac-macros/zlib.m4
@@ -89,8 +89,9 @@ case $SYSTEM_TYPE in
        fi
        ;;
      *)
-        if test -f "$mysql_zlib_dir/lib/libz.a" -a \ 
+        if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \
-                -f "$mysql_zlib_dir/include/zlib.h"; then
+                   -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