diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-24 12:04:10 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-24 12:04:10 +0200 |
| commit | 1caa459742eb793a50a52051248fd4341a2b1a08 (patch) | |
| tree | 1dbec73f398cce16502f2394f9467d23a92232a4 | |
| parent | 9a7a78f700e42fb90d8bc6c820013356c40e6615 (diff) | |
| parent | 5500b0b66c13d145ce29b614a20f928034c674c1 (diff) | |
| download | mariadb-git-1caa459742eb793a50a52051248fd4341a2b1a08.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 ;; |