summaryrefslogtreecommitdiff
path: root/BUILD/SETUP.sh
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-02-07 21:34:35 +0200
committerunknown <monty@hundin.mysql.fi>2002-02-07 21:34:35 +0200
commit3942e44524777ead3d8c5dd314fd0b7bc3e13f32 (patch)
tree67009f11ad55cd9073d02909883f5369a74f101f /BUILD/SETUP.sh
parent8a56717c4ce14aa7e36e04a8dc880dcc1311ea28 (diff)
downloadmariadb-git-3942e44524777ead3d8c5dd314fd0b7bc3e13f32.tar.gz
Update to autoconf 2.52
Fix of InnoDB variables in SHOW VARIABLES Fix for ALTER TABLE and InnoDB BUILD/FINISH.sh: Update to autoconf 2.52 BUILD/SETUP.sh: Update to autoconf 2.52 BUILD/compile-alpha: Update to autoconf 2.52 BUILD/compile-pentium-gcov: Update to autoconf 2.52 BUILD/compile-pentium-gprof: Update to autoconf 2.52 BUILD/compile-pentium: Update to autoconf 2.52 Docs/manual.texi: Changelog acconfig.h: Update to autoconf 2.52 acinclude.m4: Update to autoconf 2.52 bdb/dist/configure.in: Update to autoconf 2.52 client/Makefile.am: Update to autoconf 2.52 configure.in: Update to autoconf 2.52 mysql-test/r/innodb.result: Update of InnoDB Cardinality values mysys/Makefile.am: Update to autoconf 2.52 scripts/Makefile.am: Update to autoconf 2.52 sql/ha_innobase.cc: Fix of InnoDB variables in SHOW VARIABLES sql/ha_innobase.h: Fix of InnoDB variables in SHOW VARIABLES sql/sql_table.cc: Fix for ALTER TABLE and InnoDB support-files/my-huge.cnf.sh: Fixed typo support-files/my-large.cnf.sh: Fixed typo support-files/my-medium.cnf.sh: Fixed typo support-files/my-small.cnf.sh: Fixed typo
Diffstat (limited to 'BUILD/SETUP.sh')
-rw-r--r--BUILD/SETUP.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 0f2334dd573..a69cdcb14fd 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -52,7 +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"
+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=""
@@ -68,7 +69,9 @@ fi
if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1
then
- CXX=c++
+ CXX="gcc -DUSE_MYSYS_NEW"
+ CXXLDFLAGS="-Wl,--defsym -Wl,__cxa_pure_virtual=0"
else
CXX=gcc
+ CXXLDFLAGS=""
fi