bk commit into 5.1 tree (msvensson:1.2392)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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.2392 06/05/12 11:32:43 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
  into  neptunus.(none):/home/msvensson/mysql/bug18818/my51-bug18818

  config/ac-macros/zlib.m4
    1.10 06/05/12 11:32:34 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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/my51-bug18818/RESYNC

--- 1.9/config/ac-macros/zlib.m4	2006-04-30 22:13:53 +02:00
+++ 1.10/config/ac-macros/zlib.m4	2006-05-12 11:32:34 +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"