mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
config/ac-macros/zlib.m4
Accept any shared library for "libz", not just the static one. Bug#6584 Repetition of the corresponding change, as the 4.1 "acinclude.m4" is not used in 5.0.
This commit is contained in:
parent
db3b5c50bc
commit
bf08909aa4
1 changed files with 3 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue