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 | |
| 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')
| -rw-r--r-- | config/ac-macros/openssl.m4 | 5 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index 1f9d53abe01..a23c46eed00 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -1,6 +1,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ incs="$1" libs="$2" + eval shrexts=\"$shrext_cmds\" case "$incs---$libs" in ---) for d in /usr/ssl/include /usr/local/ssl/include /usr/include \ @@ -15,7 +16,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \ /usr/freeware/lib32 /usr/local/lib/ ; do # Just to be safe, we test for ".so" anyway - if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then + if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext ; then OPENSSL_LIB=$d fi done @@ -28,7 +29,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ OPENSSL_INCLUDE=-I$incs fi # Just to be safe, we test for ".so" anyway - if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then + if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext ; then OPENSSL_LIB=$libs fi ;; 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" |