Skip to content

M
mariadb
Commit fc528472 authored by joerg@mysql.com's avatar joerg@mysql.com
Browse files
Options

Merge mysql.com:/M50/bug6584 into mysql.com:/M50/mysql-5.0

parents 1bf24621 bf08909a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
config/ac-macros/zlib.m4
View file @ fc528472
...@@ -89,8 +89,9 @@ case $SYSTEM_TYPE in ...@@ -89,8 +89,9 @@ case $SYSTEM_TYPE in
fi 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_INCLUDES="-I$mysql_zlib_dir/include"
ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
MYSQL_CHECK_ZLIB_DIR MYSQL_CHECK_ZLIB_DIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7