- cleaned up BUILD scripts

    - consolidate common functionality into one place
    - make them detect gmake/make

BUILD/FINISH.sh

+cflags="$c_warnings $extra_flags"
+cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
+configure="./configure $base_configs $extra_configs"
+
+CFLAGS="$cflags" CXX=gcc CXXFLAGS="$cxxflags" eval "$configure"
+
+test "$make" = no || $make $AM_MAKEFLAGS
+test -z "$strip" || strip mysqld

BUILD/SETUP.sh

+if ! test -f sql/mysqld.cc; then
+  echo "You must run this script from the MySQL top-level directory"
+  exit 1
+fi
+
+set -e	# exit on error
+
+AM_MAKEFLAGS="-j4"    # XXX: auto-make uses this variable - export it???
+
+# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
+# The following warning flag will give too many warnings:
+# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as
+# __attribute()__ doesn't work with gnu C++)
+global_warnings="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
+c_warnings="$global_warnings -Wunused"
+cxx_warnings="$global_warnings -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+
+alpha_cflags="-mcpu=ev6 -Wa,-mev6"	# not used yet
+pentium_cflags="-mpentiumpro"
+sparc_cflags=""
+
+fast_cflags="-O6 -fomit-frame-pointer"
+debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2"
+
+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 --disable-shared"
+alpha_configs=""	# not used yet
+pentium_configs=""
+sparc_configs=""
+
+debug_configs="--with-debug"
+
+if gmake --version > /dev/null 2>&1; then
+  make=gmake
+else
+  make=make
+fi
+
+$make -k clean || true
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf

BUILD/compile-alpha

-make -k clean
-/bin/rm -f */.deps/*.P */*.o
-/bin/rm -f config.cache
-aclocal; autoheader; aclocal; automake; autoconf
+#! /bin/sh
 
-CFLAGS="-O6 -fomit-frame-pointer -mcpu=ev6 -Wa,-mev6" CXX=gcc CXXFLAGS="-O6 -mcpu=ev6 -Wa,-mev6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
-make
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$alpha_cflags $fast_cflags"
+extra_configs="$alpha_configs"
+
+. "$path/FINISH.sh"

BUILD/compile-pentium

-AM_MAKEFLAGS="-j 2"
-make -k clean
-/bin/rm -f */.deps/*.P config.cache
+#! /bin/sh
 
-aclocal; autoheader; aclocal; automake; autoconf
+path=`dirname $0`
+. "$path/SETUP.sh"
 
-CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --enable-thread-safe-client
-make -j 2
-strip sql/mysqld
+extra_flags="$pentium_cflags $fast_cflags"
+extra_configs="$pentium_configs"
+strip=yes
+
+. "$path/FINISH.sh"

BUILD/compile-pentium-debug

-AM_MAKEFLAGS="-j 2"
-make -k clean
-/bin/rm -f */.deps/*.P config.cache
+#! /bin/sh
 
-aclocal; autoheader; aclocal; automake; autoconf
+path=`dirname $0`
+. "$path/SETUP.sh"
 
-# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
-# The following warning flag will give too many warnings:
-# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as
-# __attribute()__ doesn't work with gnu C++)
+extra_flags="$pentium_cflags $debug_cflags"
+extra_configs="$pentium_configs $debug_configs"
 
-GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
-C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
-CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
-
-
-CFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \
-CXXFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \
-./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full \
---with-berkeley-db=/usr/local/BerkeleyDB
-make -j 2
+. "$path/FINISH.sh"

BUILD/compile-pentium-debug-no-bdb

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
+#! /bin/sh
 
-aclocal; autoheader; aclocal; automake; autoconf
+path=`dirname $0`
+. "$path/SETUP.sh"
 
-# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
-# The following warning flag will give too many warnings:
-# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as
-# __attribute()__ doesn't work with gnu C++)
+extra_flags="$pentium_cflags $debug_cflags"
+extra_configs="$pentium_configs $debug_configs --without-berkeley-db"
 
-GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
-C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
-CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
-
-
-CFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \
-CXXFLAGS="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \
-./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full 
-make
+. "$path/FINISH.sh"

BUILD/compile-pentium-gcov

-AM_MAKEFLAGS="-j 2"
-make -k clean
-/bin/rm -f */.deps/*.P config.cache
+#! /bin/sh
 
-aclocal; autoheader; aclocal; automake; autoconf
+path=`dirname $0`
+. "$path/SETUP.sh"
 
-# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
-# The following warning flag will give too many warnings:
-# -Wshadow -Wunused  (The later isn't usable in C++ as
-# __attribute()__ doesn't work with gnu C++)
-
-GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts  -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
-C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
-CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
-
-CFLAGS="-O2 -mpentiumpro -fprofile-arcs -ftest-coverage $C_WARNINGS" CXX=gcc CXXFLAGS="-O2 -mpentiumpro -fprofile-arcs -ftest-coverage -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full
-make -j 2
+extra_flags="$pentium_cflags -O2 -fprofile-arcs -ftest-coverage"
+extra_configs="$pentium_configs $debug_configs"
 
+. "$path/FINISH.sh"

BUILD/compile-pentium-myodbc

-make -k clean
-/bin/rm -f */.deps/*.P config.cache
+#! /bin/sh
 
-aclocal; autoheader; aclocal; automake; autoconf
+path=`dirname $0`
+. "$path/SETUP.sh"
 
-CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --with-extra-charsets=complex --without-server
+extra_flags="$pentium_cflags $fast_cflags"
+extra_configs="$pentium_configs --without-server"
+
+make=no
+strip=yes
+
+. "$path/FINISH.sh"

BUILD/compile-solaris-sparc

-gmake -k clean
-/bin/rm -f */.deps/*.P */*.o
-/bin/rm -f config.cache
-aclocal; autoheader; aclocal; automake; autoconf
+#! /bin/sh
 
-CFLAGS="-O6 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -f
-elide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/m
-ysql --with-extra-charsets=complex 
-gmake
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$sparc_cflags $fast_cflags"
+extra_configs="$sparc_configs"
+
+. "$path/FINISH.sh"

BUILD/compile-solaris-sparc-purify

-gmake -k clean
-/bin/rm -f */.deps/*.P */*.o
-/bin/rm -f config.cache
-aclocal; autoheader; aclocal; automake; autoconf
+#! /bin/sh
 
-GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
-C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
-CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+path=`dirname $0`
+. "$path/SETUP.sh"
 
-CFLAGS="-DHAVE_PURIFY -O2 $C_WARNINGS" CXX=gcc \
-CXXFLAGS="-DHAVE_PURIFY -O2 -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \
-./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared  --with-debug=full
-gmake
+extra_flags="$sparc_cflags -DHAVE_PURIFY -O2"
+extra_configs="$sparc_configs --with-debug=full"
+
+. "$path/FINISH.sh"