bk commit into 5.0 tree (msvensson:1.2104) BUG#18818

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2104 06/04/28 13:55:40 msvensson@neptunus.(none) +2 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
   - Eval shrext_cmds variable before using it
   - Moved from acinclude.m4 to openssl.m4 and zlib.m4 when merging 4.1 -> 5.0

  config/ac-macros/zlib.m4
    1.8 06/04/28 13:55:36 msvensson@neptunus.(none) +2 -1
    Move from acinclude.m4

  config/ac-macros/openssl.m4
    1.6 06/04/28 13:55:36 msvensson@neptunus.(none) +3 -2
    Move from acinclude.m4

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.5/config/ac-macros/openssl.m4	2006-03-31 01:02:43 +02:00
+++ 1.6/config/ac-macros/openssl.m4	2006-04-28 13:55:36 +02:00
@@ -1,6 +1,7 @@
 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 \
@@ -15,7 +16,7 @@
 /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$shrext ; then
         OPENSSL_LIB=$d
       fi
       done
@@ -28,7 +29,7 @@
         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$shrext ; then
         OPENSSL_LIB=$libs
       fi
       ;;

--- 1.7/config/ac-macros/zlib.m4	2006-04-01 03:46:55 +02:00
+++ 1.8/config/ac-macros/zlib.m4	2006-04-28 13:55:36 +02:00
@@ -90,8 +90,9 @@
         ;;
       *)
         # 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$shrext" \) \
                 -a -f "$mysql_zlib_dir/include/zlib.h"; then
           ZLIB_INCLUDES="-I$mysql_zlib_dir/include"
           ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"