Commit 5fb23aa3 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
parents 2cd08261 07b431d1

config/ac-macros/openssl.m4

+6 −4
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 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

      # 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 ; then

      # Test for libssl using all known library file endings

      if test -f $d/libssl.a || test -f $d/libssl.so || \

         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then

        OPENSSL_LIB=$d

      fi

      done
@@ -28,8 +29,9 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      if test -f $incs/openssl/ssl.h  ; then

        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 ; then

      # Test for libssl using all known library file endings

      if test -f $d/libssl.a || test -f $d/libssl.so || \

         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then

        OPENSSL_LIB=$libs

      fi

      ;;

config/ac-macros/zlib.m4

+5 −4
Original line number Diff line number Diff line
@@ -89,10 +89,11 @@ case $SYSTEM_TYPE in 
        fi

        ;;

      *)

        # 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" \) \

        # Test for libz using all known library file endings

        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" \) \

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

          ZLIB_INCLUDES="-I$mysql_zlib_dir/include"

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