diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:04:52 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-06 02:04:52 +0200 |
| commit | fb74fccff9e46cc6392fae262491d4b4218f4e5e (patch) | |
| tree | f66f929cc02cd3b110667183929f39e5bd2231a9 /configure.in | |
| parent | 14810ff1d3e7d74167f59c6c4baf1f11491810f7 (diff) | |
| parent | e3c7f4d85ec4caf59fc408cf5643e5dc64e9a3d4 (diff) | |
| download | mariadb-git-fb74fccff9e46cc6392fae262491d4b4218f4e5e.tar.gz | |
Merge with 4.0.8
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
acinclude.m4:
Auto merged
include/mysql.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/table.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in index eae4b52fdca..f2e64ddffe4 100644 --- a/configure.in +++ b/configure.in @@ -882,6 +882,7 @@ int main() # MAX_C_OPTIMIZE="-O3" +MAX_CXX_OPTIMIZE="-O3" case $SYSTEM_TYPE in *solaris2.7*) @@ -949,6 +950,8 @@ case $SYSTEM_TYPE in then CFLAGS="$CFLAGS +DD64 -DHAVE_BROKEN_INLINE" CXXFLAGS="$CXXFLAGS +DD64 +O2" + MAX_C_OPTIMIZE="" + MAX_CXX_OPTIMIZE="" fi ;; *rhapsody*) @@ -1407,7 +1410,7 @@ if test "$ac_cv_prog_cxx_g" = "yes" then DEBUG_CXXFLAGS="-g" DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" + OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE" else DEBUG_CXXFLAGS="-g" DEBUG_OPTIMIZE_CXX="" |