summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-06-01 23:35:08 +0300
committerunknown <monty@mysql.com>2004-06-01 23:35:08 +0300
commit1b11594d53f451aadb6b47a801187eb7bd1f98d9 (patch)
tree9fe6ea92a7fb5f334c4223f3189099fe1212f99d
parent2a1a6e5a2a7eb297d9bca4b64e69f824dbbd1a69 (diff)
parent010fffc2f7568e219018706918e08e7310b38fcd (diff)
downloadmariadb-git-1b11594d53f451aadb6b47a801187eb7bd1f98d9.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
-rw-r--r--configure.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index f2b66d1e09d..e346ebfa15e 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 4.0.20)
+AM_INIT_AUTOMAKE(mysql, 4.0.21)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
@@ -767,7 +767,14 @@ AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
# For compress in zlib
-MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
+case $SYSTEM_TYPE in
+ *netware*)
+ AC_DEFINE(HAVE_COMPRESS)
+ ;;
+ *)
+ MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
+ ;;
+esac
#--------------------------------------------------------------------
# Check for TCP wrapper support