Update needed for SuSE 7.3

Update for autoconf 2.52


BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8:
  Delete: BUILD/compile-pentium-symbols
BUILD/Makefile.am:
  Remove not used scripts
BUILD/SETUP.sh:
  Update needed for SuSE 7.3
BUILD/compile-alpha:
  Update needed for SuSE 7.3
BUILD/compile-pentium-debug-no-bdb:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gcov:
  Update needed for SuSE 7.3
BUILD/compile-pentium-gprof:
  Update needed for SuSE 7.3
BUILD/compile-pentium-mysqlfs-debug:
  Update needed for SuSE 7.3
BUILD/compile-pentium:
  Update needed for SuSE 7.3
Docs/manual.texi:
  changelog
Docs/mysqld_error.txt:
  New error messages.
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
myisam/mi_check.c:
  Fix for myisamchk bug when reparing table with many keys.
myisam/mi_key.c:
  Fix problem with NAN in key's
scripts/Makefile.am:
  Fix for autoconf 2.52
scripts/mysql_new_fix_privilege_tables.sh:
  cleanup

9 files changed, 8 insertions, 26 deletions

diff --git a/BUILD/Makefile.am b/BUILD/Makefile.am
index ca42a79eec0..438b3a528cd 100644
--- a/BUILD/Makefile.am
+++ b/BUILD/Makefile.am
@@ -35,7 +35,6 @@ EXTRA_DIST =		FINISH.sh \
 			compile-pentium-myodbc \
 			compile-pentium-mysqlfs-debug \
 			compile-pentium-pgcc \
-			compile-pentium-symbols \
 			compile-solaris-sparc \
 			compile-solaris-sparc-debug \
 			compile-solaris-sparc-fortre \
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 3fa297fea1a..a69cdcb14fd 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -52,8 +52,8 @@ debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O1"
 
 base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
 
-base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-all-static \
- --with-client-ldflags=-all-static"
+base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client"
+static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""
diff --git a/BUILD/compile-alpha b/BUILD/compile-alpha
index 10b9d67e1c1..ce5050fee72 100755
--- a/BUILD/compile-alpha
+++ b/BUILD/compile-alpha
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$alpha_cflags $fast_cflags"
-extra_configs="$alpha_configs"
+extra_configs="$alpha_configs $static_link"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium
index 11559be93de..b8f8d028e1f 100755
--- a/BUILD/compile-pentium
+++ b/BUILD/compile-pentium
@@ -4,9 +4,7 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $fast_cflags"
-extra_configs="$pentium_configs"
+extra_configs="$pentium_configs $static_link"
 strip=yes
 
-extra_configs="$extra_configs"
-
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-debug-no-bdb b/BUILD/compile-pentium-debug-no-bdb
index fad58bec437..d7e70f868cc 100755
--- a/BUILD/compile-pentium-debug-no-bdb
+++ b/BUILD/compile-pentium-debug-no-bdb
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags $debug_cflags"
-extra_configs="$pentium_configs $debug_configs --without-berkeley-db"
+extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index 6b5c432e999..873d1d0d8e8 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
-extra_configs="$pentium_configs $debug_configs --disable-shared"
+extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-gprof b/BUILD/compile-pentium-gprof
index 02b595d1015..aa74de0b1b2 100755
--- a/BUILD/compile-pentium-gprof
+++ b/BUILD/compile-pentium-gprof
@@ -4,6 +4,6 @@ path=`dirname $0`
 . "$path/SETUP.sh"
 
 extra_flags="$pentium_cflags -O2 -pg -g"
-extra_configs="$pentium_configs $debug_configs --disable-shared"
+extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
 
 . "$path/FINISH.sh"
diff --git a/BUILD/compile-pentium-mysqlfs-debug b/BUILD/compile-pentium-mysqlfs-debug
index 2455c086532..6643553d943 100755
--- a/BUILD/compile-pentium-mysqlfs-debug
+++ b/BUILD/compile-pentium-mysqlfs-debug
@@ -6,7 +6,7 @@ path=`dirname $0`
 extra_flags="$pentium_cflags $debug_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
+extra_configs="$pentium_configs $debug_configs $static_link"
 
 extra_configs="$extra_configs --with-debug=full --with-mysqlfs --without-server --without-pstack"
 
diff --git a/BUILD/compile-pentium-symbols b/BUILD/compile-pentium-symbols
deleted file mode 100755
index 4f63763606f..00000000000
--- a/BUILD/compile-pentium-symbols
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-path=`dirname $0`
-. "$path/SETUP.sh"
-
-extra_flags="$pentium_cflags $fast_cflags -g"
-extra_configs="$pentium_configs"
-
-# Use the optimized version if it exists
-if test -d /usr/local/BerkeleyDB-opt/
-then
- extra_configs="$extra_configs --with-berkeley-db=/usr/local/BerkeleyDB-opt/"
-fi
-
-. "$path/FINISH.sh"