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

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

config/ac-macros/zlib.m4

@@ -10,16 +10,25 @@ AC_SUBST([zlib_dir])
 mysql_cv_compress="yes"
 ])
 
-dnl Auxiliary macro to check for zlib at given path
+dnl Auxiliary macro to check for zlib at given path.
+dnl We are strict with the server, as "archive" engine
+dnl needs zlibCompileFlags(), but for client only we
+dnl are less strict, and take the zlib we find.
 
 AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
 CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
 LIBS="$LIBS $ZLIB_LIBS"
+if test X"$with_server" = Xno
+then
+  zlibsym=zlibVersion
+else
+  zlibsym=zlibCompileFlags
+fi
 AC_CACHE_VAL([mysql_cv_compress],
   [AC_TRY_LINK([#include <zlib.h>],
-    [return zlibCompileFlags();],
+    [return $zlibsym();],
     [mysql_cv_compress="yes"
     AC_MSG_RESULT([ok])],
     [mysql_cv_compress="no"])