summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-16 23:41:45 +0200
committerunknown <monty@donna.mysql.com>2000-12-16 23:41:45 +0200
commit289de3ff9d278a61e28d854b9010cc7967b9dc11 (patch)
treea884910ed118d34b9de837e52be9e458c4b8619d /configure.in
parent77a3ea5103f73aac2e3c8868abb2c93c8d01184b (diff)
downloadmariadb-git-289de3ff9d278a61e28d854b9010cc7967b9dc11.tar.gz
Fixed error when copying mysqld_multi
Fixes for mysql-test Fixed race condition in SHOW LOGS BUILD/compile-solaris-sparc: cleanup Build-tools/Do-compile: Fixed problem Makefile.am: Merged tests with benchmarks configure.in: Fix for Solaris 2.8 scripts/Makefile.am: Fixed error when copying mysqld_multi scripts/make_binary_distribution.sh: Fixes for mysql-test sql/ha_berkeley.cc: Fixed race condition in SHOW LOGS sql/mysqld.cc: Fixed bug in networking
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in18
1 files changed, 16 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 5cf616d95eb..00f8644f269 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, 3.23.29-gamma)
+AM_INIT_AUTOMAKE(mysql, 3.23.29a-gamma)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
@@ -637,6 +637,20 @@ case $SYSTEM_TYPE in
CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
;;
+ *solaris2.8*)
+ # Solaris 2.8 has a broken /usr/include/widec.h
+ # Make a fixed copy in ./include
+ echo "Fixing broken include files for $SYSTEM_TYPE"
+ echo " - Creating local copy of widec.h"
+ if test ! -d include
+ then
+ mkdir ./include
+ fi
+ builddir=`pwd`
+ sed -e "s|^#if[ ]*!defined(__lint)|#if !defined\(__lint\) \&\& !defined\(getwc\)|" < /usr/include/widec.h > include/widec.h
+ CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
+ CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
+ ;;
*solaris2.5.1*)
echo "Enabling getpass() workaround for Solaris 2.5.1"
CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS -DHAVE_RWLOCK_T";
@@ -1514,7 +1528,7 @@ AC_ARG_WITH(bench,
if test "$with_bench" = "yes"
then
- bench_dirs="sql-bench"
+ bench_dirs="sql-bench mysql-test"
else
bench_dirs=""
fi