mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Bug#18818 configure: No longer finds OpenSSL on Mac OS X
- Remove usage of $shrext_cmds variable - Test for libs using all known library file endings config/ac-macros/openssl.m4: Remove the usage of $shrext_cmds. instead test for all the library file endings we currently know, that is .a .so .sl and .dylib config/ac-macros/zlib.m4: Remove the usage of $shrext_cmds. instead test for all the library file endings we currently know, that is .a .so .sl and .dylib
This commit is contained in:
parent
c7d8702205
commit
07b431d1d8
2 changed files with 11 additions and 8 deletions
|
|
@ -89,10 +89,11 @@ case $SYSTEM_TYPE in
|
|||
fi
|
||||
;;
|
||||
*)
|
||||
# Just to be safe, we test for ".so" anyway
|
||||
eval shrexts=\"$shrext_cmds\"
|
||||
if test \( -f "$mysql_zlib_dir/lib/libz.a" -o -f "$mysql_zlib_dir/lib/libz.so" -o \
|
||||
-f "$mysql_zlib_dir/lib/libz$shrext" \) \
|
||||
# Test for libz using all known library file endings
|
||||
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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue