Portability fix

BUILD/compile-alpha-cxx:
  Don't do depend files with Compaq compiler
configure.in:
  Don't do depend files with Compaq compiler
extra/mysql_waitpid.c:
  Portability fixes
mysql-test/mysql-test-run.sh:
  Better timeout for valgrind

4 files changed, 29 insertions, 7 deletions

diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx
index 3e6eee9a0d6..a342d927868 100755
--- a/BUILD/compile-alpha-cxx
+++ b/BUILD/compile-alpha-cxx
@@ -4,7 +4,7 @@ make -k clean
 /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
 aclocal; autoheader; aclocal; automake; autoconf
 
-CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools
+CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking
 
 make -j2
 find . -name ".deps" | xargs rm -r 
diff --git a/configure.in b/configure.in
index 06dc6e03fb6..e689771d1ce 100644
--- a/configure.in
+++ b/configure.in
@@ -2360,6 +2360,7 @@ EOF
 
   if test X"$have_innodb" = Xyes
   then
+    innodb_conf_flags=""
     sql_server_dirs="$sql_server_dirs innobase"
     echo "CONFIGURING FOR INNODB" 
     if test ! -d "innobase"; then
@@ -2372,7 +2373,11 @@ EOF
 	/* ) rel_srcdir="$srcdir" ;;
 	* )  rel_srcdir="../$srcdir" ;;
     esac
-    (cd innobase && sh $rel_srcdir/innobase/configure) \
+    if test "x$enable_dependency_tracking" == xno
+    then
+      innodb_conf_flags=--disable-dependency-tracking
+    fi
+    (cd innobase && sh $rel_srcdir/innobase/configure $innodb_conf_flags) \
     || AC_MSG_ERROR([could not configure INNODB])
 
     echo "END OF INNODB CONFIGURATION"
diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c
index 14d3f893c60..007db959111 100644
--- a/extra/mysql_waitpid.c
+++ b/extra/mysql_waitpid.c
@@ -1,9 +1,26 @@
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-#include <string.h>
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* Wait until a program dies */
+
 #include <my_global.h>
+#include <m_string.h>
 #include <my_getopt.h>
+#include <signal.h>
+#include <errno.h>
 
 static const char *VER= "1.1";
 static char *progname;
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 408c76d8602..a7292ee5eec 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -328,7 +328,7 @@ while test $# -gt 0; do
       VALGRIND="valgrind --alignment=8 --leak-check=yes"
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc"
-      #SLEEP_TIME_AFTER_RESTART=120
+      SLEEP_TIME_AFTER_RESTART=10
       SLEEP_TIME_FOR_DELETE=120
       ;;
     --valgrind-options=*)