bk commit into 5.0 tree (msvensson:1.2117) 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.2117 06/05/12 11:29:31 msvensson@neptunus.(none) +2 -0
  Bug#18818 configure: No longer finds OpenSSL on Mac OS X
     - Remove usage of $shrext_cmds variable
     - Test for libs using all known library file endings

  config/ac-macros/zlib.m4
    1.9 06/05/12 11:29:26 msvensson@neptunus.(none) +5 -4
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

  config/ac-macros/openssl.m4
    1.7 06/05/12 11:29:26 msvensson@neptunus.(none) +6 -4
    Remove the usage of $shrext_cmds. instead test for all the library file
    endings we currently know, that is .a .so .sl and .dylib

# 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/bug18818/my50-bug18818

--- 1.6/config/ac-macros/openssl.m4	2006-04-28 13:55:36 +02:00
+++ 1.7/config/ac-macros/openssl.m4	2006-05-12 11:29:26 +02:00
@@ -15,8 +15,9 @@
       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 @@
       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
       ;;

--- 1.8/config/ac-macros/zlib.m4	2006-04-28 13:55:36 +02:00
+++ 1.9/config/ac-macros/zlib.m4	2006-05-12 11:29:26 +02:00
@@ -89,10 +89,11 @@
         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"