Commit 1b11594d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/my/mysql-4.0

parents 2a1a6e5a 010fffc2
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -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
case $SYSTEM_TYPE in
  *netware*)
    AC_DEFINE(HAVE_COMPRESS)
    ;;
  *)
    MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
    ;;
esac

#--------------------------------------------------------------------
# Check for TCP wrapper support