diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-12 11:29:31 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-12 11:29:31 +0200 |
| commit | 07b431d1d81fa4ec2150c429578b65022cfab42d (patch) | |
| tree | 3fc7d84c8c580448d9b7ded0e726682996d72e6c /config/ac-macros/zlib.m4 | |
| parent | c7d8702205dbdcbb9eaa757026325290873d52ec (diff) | |
| download | mariadb-git-07b431d1d81fa4ec2150c429578b65022cfab42d.tar.gz | |
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
Diffstat (limited to 'config/ac-macros/zlib.m4')
| -rw-r--r-- | config/ac-macros/zlib.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index c75bac58d7c..a01d13937ff 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -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" |