diff options
| author | unknown <joerg@mysql.com> | 2005-11-09 12:16:37 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-11-09 12:16:37 +0100 |
| commit | 01cfb179a40807153c840470e499abb700c6511a (patch) | |
| tree | 6595fb1e16f7f259168fd013854e8804f608fa98 | |
| parent | 2c9ae9714981a5e0905d3d62250108046ef48894 (diff) | |
| parent | f783a1343d65d3e2674459ea72ccfa99da37e4ac (diff) | |
| download | mariadb-git-01cfb179a40807153c840470e499abb700c6511a.tar.gz | |
Merge mysql.com:/M50/bug6584 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 |