1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  mysql.com:/usr/home/ram/work/mysql-4.1
This commit is contained in:
unknown 2005-11-01 09:52:45 +04:00
commit cc953ed32a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
acinclude.m4
View File

@ -310,8 +310,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