From dced93482062f1bf0294ed82d9408781d76879ee Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Nov 2005 20:49:02 +0100 Subject: 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 94a26f33dd3..22cf9542cf0 100644 --- 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 \ - -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 -- cgit v1.2.1