diff options
| author | unknown <konstantin@mysql.com> | 2004-07-27 10:05:56 -0700 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-07-27 10:05:56 -0700 |
| commit | 5217955d1a5268fb8cf9e0c4293460725572733d (patch) | |
| tree | 33f68cd1e472a560f82f0f039e0f061b62f0f371 /configure.in | |
| parent | 906ad26dc5466bfc98513d2529256f4f95214893 (diff) | |
| parent | 6a371e242b7ee7549089233662d0b2c369e51d64 (diff) | |
| download | mariadb-git-5217955d1a5268fb8cf9e0c4293460725572733d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib
configure.in:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/configure.in b/configure.in index da3d9dfbb71..afcc60942ce 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 |