Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build


config/ac-macros/zlib.m4:
  Auto merged
mysys/my_memmem.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

config/ac-macros/zlib.m4

@@ -2,7 +2,7 @@ dnl Define zlib paths to point at bundled zlib
 
 AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [
 ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"
-ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"
+ZLIB_LIBS="\$(top_builddir)/zlib/libzlt.la"
 dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.
 ZLIB_DEPS="-lz"
 zlib_dir="zlib"

zlib/Makefile.am

@@ -19,17 +19,18 @@ INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include
 
 LIBS= $(NON_THREADED_LIBS)
 
-pkglib_LTLIBRARIES=libz.la
+pkglib_LTLIBRARIES = libz.la
+noinst_LTLIBRARIES = libzlt.la
 
-# We are never interested in a shared version
-libz_la_LDFLAGS= -static
+libz_la_LDFLAGS    = -static
 
-noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \
-		inftrees.h trees.h zconf.h zlib.h zutil.h
+noinst_HEADERS     = crc32.h deflate.h inffast.h inffixed.h inflate.h \
+		     inftrees.h trees.h zconf.h zlib.h zutil.h
 
-libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \
-		 infback.c inffast.c inflate.c inftrees.c trees.c \
-		 uncompr.c zutil.c
+libz_la_SOURCES    = adler32.c compress.c crc32.c deflate.c gzio.c \
+		     infback.c inffast.c inflate.c inftrees.c trees.c \
+		     uncompr.c zutil.c
+libzlt_la_SOURCES  = $(libz_la_SOURCES)
 
 EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt