diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-28 13:55:40 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-28 13:55:40 +0200 |
| commit | 9b69052c6177fb0a3aa7b7bd4c6b0c50cc0ddef6 (patch) | |
| tree | 320d0ffaebab90b14ee015410c7f609a95f63339 /config/ac-macros/zlib.m4 | |
| parent | 728ad6ddb979a2b7b44d0c0407ceebd0bb8e8799 (diff) | |
| download | mariadb-git-9b69052c6177fb0a3aa7b7bd4c6b0c50cc0ddef6.tar.gz | |
Bug#18818 configure: No longer finds OpenSSL on Mac OS X
- Eval shrext_cmds variable before using it
- Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0
config/ac-macros/openssl.m4:
Move from acinclude.m4
config/ac-macros/zlib.m4:
Move from acinclude.m4
Diffstat (limited to 'config/ac-macros/zlib.m4')
| -rw-r--r-- | config/ac-macros/zlib.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index a8c54c845a1..c75bac58d7c 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -90,8 +90,9 @@ case $SYSTEM_TYPE in ;; *) # 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_cmds" \) \ + -f "$mysql_zlib_dir/lib/libz$shrext" \) \ -a -f "$mysql_zlib_dir/include/zlib.h"; then ZLIB_INCLUDES="-I$mysql_zlib_dir/include" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" |