bk commit into 4.1 tree (msvensson:1.2480) BUG#18818

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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.2480 06/05/05 20:04:11 msvensson@shellback.(none) +1 -0
  BUG#18818 configure: No longer finds OpenSSL on Mac OS X
   - Remove the usage of shrext_cmds variable.
   - Add check to also look for .sl libs

  acinclude.m4
    1.142 06/05/05 16:36:43 msvensson@shellback.(none) +29 -14
    Revert the change to use $shrext_cmds to find the shared libraries  for openSSL or
zlib.
    Just hardcode in all the fileendings we know about.

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-4.1

--- 1.141/acinclude.m4	2006-04-19 20:26:36 +02:00
+++ 1.142/acinclude.m4	2006-05-05 16:36:43 +02:00
@@ -310,11 +310,15 @@
         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$shrexts" \) \
-                -a -f "$mysql_zlib_dir/include/zlib.h"; then
+	# Test if we can find the zlib dir with any of the known
+        # shared library file endings
+        # Also check for the zlib.h inlude file
+        if \( test -f $mysql_zlib_dir/lib/libz.a || \
+              test -f $mysql_zlib_dir/lib/libz.so || \
+              test -f $mysql_zlib_dir/lib/libz.sl || \
+              test -f $mysql_zlib_dir/lib/libz.dylib \) && \
+              test -f $mysql_zlib_dir/include/zlib.h ; then
+
           ZLIB_INCLUDES="-I$mysql_zlib_dir/include"
           ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
           MYSQL_CHECK_ZLIB_DIR
@@ -968,22 +972,25 @@
 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 \
-/usr/include/ssl /opt/ssl/include /opt/openssl/include \
-/usr/local/ssl/include /usr/local/include /usr/freeware/include ; do
+               /usr/include/ssl /opt/ssl/include /opt/openssl/include \
+               /usr/local/ssl/include /usr/local/include \
+               /usr/freeware/include ; do
        if test -f $d/openssl/ssl.h  ; then
          OPENSSL_INCLUDE=-I$d
        fi
       done
 
       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$shrexts ; then
+               /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
+               /usr/freeware/lib32 /usr/local/lib/ ; do
+      # Test for the library with all known shared library 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
@@ -992,11 +999,15 @@
       AC_MSG_ERROR([if either 'includes' or 'libs' is specified, both must be specified])
       ;;
     * )
+      # Both open ssl inlcludes and libs given by user
       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$shrexts" ; then
+      # Test for the library with all known shared library endings
+      if test -f $libs/libssl.a || \
+         test -f $libs/libssl.so || \
+         test -f $libs/libssl.sl || \
+	 test -f $libs/libssl.dylib ; then
         OPENSSL_LIB=$libs
       fi
       ;;
@@ -1020,6 +1031,10 @@
    fi
   exit 1
  fi
+
+ echo "\nUsing OpenSSL include files from $OPENSSL_INCLUDE\n"
+ echo "Using OpenSSL libs from $OPENSSL_LIBS\n"
+
 
 ])