Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-nov08-push
This commit is contained in:
commit
0816119f26
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user