diff options
author | unknown <joerg@mysql.com> | 2005-11-09 12:45:34 +0100 |
---|---|---|
committer | unknown <joerg@mysql.com> | 2005-11-09 12:45:34 +0100 |
commit | 26320ebe2f1c56d3376a94a60291c95c0cf0658d (patch) | |
tree | e228dc88605f6bec66756bab71a52dca7011a7c7 | |
parent | 980865bbef4f28362cea8d02d90867a222f7f5a2 (diff) | |
parent | 01cfb179a40807153c840470e499abb700c6511a (diff) | |
download | mariadb-git-clone-5.0.16-build.tar.gz |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0clone-5.0.16-build
into mysql.com:/M50/mysql-5.0
-rw-r--r-- | config/ac-macros/zlib.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
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 |