bk commit into 5.0 tree (kent:1.2125) BUG#16332

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2125 06/03/31 01:03:45 kent@stripped +2 -0
  zlib.m4, openssl.m4:
    Use  when testing if shared library exists, bug#16332

  config/ac-macros/zlib.m4
    1.6 06/03/31 01:02:43 kent@stripped +2 -1
    Use  when testing if shared library exists, bug#16332

  config/ac-macros/openssl.m4
    1.5 06/03/31 01:02:43 kent@stripped +4 -2
    Use  when testing if shared library exists, bug#16332

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new

--- 1.4/config/ac-macros/openssl.m4	2005-04-26 12:16:08 +02:00
+++ 1.5/config/ac-macros/openssl.m4	2006-03-31 01:02:43 +02:00
@@ -14,7 +14,8 @@
       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 @@
       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
       ;;

--- 1.5/config/ac-macros/zlib.m4	2005-11-21 16:05:33 +01:00
+++ 1.6/config/ac-macros/zlib.m4	2006-03-31 01:02:43 +02:00
@@ -89,8 +89,9 @@
         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"