diff options
| author | msvensson@neptunus.(none) <> | 2006-04-28 13:55:40 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-04-28 13:55:40 +0200 |
| commit | 50c920ffab6818336c5cb44067462c1a2f855407 (patch) | |
| tree | 320d0ffaebab90b14ee015410c7f609a95f63339 /config/ac-macros/openssl.m4 | |
| parent | e44d4e3e2b1533a4f7136ae861562346e7b6b909 (diff) | |
| download | mariadb-git-50c920ffab6818336c5cb44067462c1a2f855407.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
Diffstat (limited to 'config/ac-macros/openssl.m4')
| -rw-r--r-- | config/ac-macros/openssl.m4 | 5 |
1 files changed, 3 insertions, 2 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 ;; |