diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-27 08:42:36 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-27 08:42:36 +0200 |
| commit | 18a140b3e75d823298b71610d3ad5aca6c3eb0bf (patch) | |
| tree | 6a31fbf2efd4604917f5ca880c4baab1ca4e6baa | |
| parent | 5bbd943758abc5ed1d90e3b172e5dc9e0501dfa0 (diff) | |
| parent | 5854f65b29c91479515b186fae73d1a85169600d (diff) | |
| download | mariadb-git-18a140b3e75d823298b71610d3ad5aca6c3eb0bf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8a55c1fdb20..c8cad48ff0b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -311,8 +311,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$shrexts" \) \ -a -f "$mysql_zlib_dir/include/zlib.h"; then ZLIB_INCLUDES="-I$mysql_zlib_dir/include" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" @@ -967,6 +968,7 @@ AC_DEFUN([MYSQL_CHECK_VIO], [ 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 \ @@ -981,7 +983,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$shrexts ; then OPENSSL_LIB=$d fi done @@ -994,7 +996,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$shrexts" ; then OPENSSL_LIB=$libs fi ;; |