config/ac-macros/zlib.m4

Accept any shared library for "libz", not just the static one. Bug#6584
Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.


config/ac-macros/zlib.m4:
  Accept any shared library for "libz", not just the static one. Bug#6584
  Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.

config/ac-macros/zlib.m4

@@ -89,8 +89,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