Commit fa7e5ed5 authored by unknown's avatar unknown
Browse files

zlib.m4, openssl.m4: 

  Use  when testing if shared library exists, bug#16332


config/ac-macros/openssl.m4:
  Use  when testing if shared library exists, bug#16332
config/ac-macros/zlib.m4:
  Use  when testing if shared library exists, bug#16332
parent 86504f87

config/ac-macros/openssl.m4

+4 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \

/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \

/usr/freeware/lib32 /usr/local/lib/ ; do

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then

      # 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

        OPENSSL_LIB=$d

      fi

      done
@@ -26,7 +27,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      if test -f $incs/openssl/ssl.h  ; then

        OPENSSL_INCLUDE=-I$incs

      fi

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then

      # 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

        OPENSSL_LIB=$libs

      fi

      ;;

config/ac-macros/zlib.m4

+2 −1
Original line number Diff line number Diff line
@@ -89,8 +89,9 @@ case $SYSTEM_TYPE in 
        fi

        ;;

      *)

        # Just to be safe, we test for ".so" anyway

        if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \

                   -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \

                   -f "$mysql_zlib_dir/lib/libz$shrext_cmds" \) \

                -a -f "$mysql_zlib_dir/include/zlib.h"; then

          ZLIB_INCLUDES="-I$mysql_zlib_dir/include"

          ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"