Accept any shared library for "libz", not just the static one. Bug#6584

4c73ac66 · joerg@mysql.com · 5150bd8f · 4c73ac66
Commit 4c73ac66 authored Oct 31, 2005 by joerg@mysql.com
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 \ 
+        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