WL#1518, "make bundled zlib usable for unix builds":

required autotools macro written and deployed in all apropriate Makefile.ams.
Use cases checked:
- linux, standard location of zlib, no ndb
- linux, standard locatoin of zlib, with ndb
- linux, non-standard location of zlib, no ndb
- hpux11, use of bundled zlib, no ndb 
The only non-checked case is non-standard location of zlib (or use of bundled
zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts 
like AIX52 or HPUX11, where such a check is possible. It didn't compile 
there before as these systems dont't have installed zlib, so nothing got broken ;)


Makefile.am:
  WL#1518 "make bundled zlib usable for unix builds", part 2:
  - zlib dir should be built only if there is no system zlib available;
    with introducing of DIST_SUBDIRS goal, os2, BUILD and SSH now only entered
    if make dist
acinclude.m4:
  WL#1518, "make bundled zlib usable for unix builds":
  - actual implementation of the check for various zlib usage options
configure.in:
  WL#1518, "make bundled zlib usable for unix builds":
  - MYSQL_CHECK_ZLIB_WITH_COMPRESS deployed
libmysql/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
libmysql_r/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
libmysqld/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
myisam/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib binary dir added
mysys/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
sql/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir and library dir added
tools/Makefile.am:
  WL#1518, "make bundled zlib usable for unix builds":
  - support for non-standard zlib include dir added
  - copyright added

1 files changed, 3 insertions, 20 deletions

diff --git a/configure.in b/configure.in
index 080c2bcc823..7309d73970e 100644
--- a/configure.in
+++ b/configure.in
@@ -664,15 +664,6 @@ AC_ARG_WITH(named-curses-libs,
     [ with_named_curses=no ]
     )
 
-# Force use of a zlib (compress)
-AC_ARG_WITH(named-z-libs,
-    [  --with-named-z-libs=ARG
-                          Use specified zlib libraries instead of
-                          those automatically found by configure.],
-    [ with_named_zlib=$withval ],
-    [ with_named_zlib=z ]
-    )
-
 # Make thread safe client
 AC_ARG_ENABLE(thread-safe-client,
     [  --enable-thread-safe-client   
@@ -806,16 +797,7 @@ AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt]))
 
 # For sem_xxx functions on Solaris 2.6
 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-
-# For compress in zlib
-case $SYSTEM_TYPE in
-  *netware* | *modesto*)
-    AC_DEFINE(HAVE_COMPRESS, [1])
-    ;;
-  *)
-    MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
-    ;;
-esac
+MYSQL_CHECK_ZLIB_WITH_COMPRESS
 
 #--------------------------------------------------------------------
 # Check for TCP wrapper support
@@ -945,7 +927,7 @@ then
 fi
 # We make a special variable for client library's to avoid including
 # thread libs in the client.
-NON_THREADED_CLIENT_LIBS="$LIBS"
+NON_THREADED_CLIENT_LIBS="$LIBS $ZLIB_LIBS"
 
 AC_MSG_CHECKING([for int8])
 case $SYSTEM_TYPE in
@@ -3082,6 +3064,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  include/mysql_version.h dnl
  cmd-line-utils/Makefile dnl
  cmd-line-utils/libedit/Makefile dnl
+ zlib/Makefile dnl
  cmd-line-utils/readline/Makefile)
  AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
  AC_OUTPUT