diff options
| author | unknown <guilhem@mysql.com> | 2005-11-19 10:43:28 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-11-19 10:43:28 +0100 |
| commit | 380690316f2b14b80376d18da189505de35568f4 (patch) | |
| tree | 50c76691f3d387a96de6c97132369326378c35ab /configure.in | |
| parent | a06f394e68a2aa0207a908198ef3fbdb938725da (diff) | |
| parent | 6ba79a251681a765f491db1428a467a0a06a69bd (diff) | |
| download | mariadb-git-380690316f2b14b80376d18da189505de35568f4.tar.gz | |
Merge mysql.com:/home/mysql_src/mysql-5.0-van
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
configure.in:
Auto merged
mysql-test/r/ndb_charset.result:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/base64.c:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/tools/ndb_size.pl:
Auto merged
storage/ndb/tools/ndb_size.tmpl:
Auto merged
mysql-test/t/disabled.def:
merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
used "ul", Pekka said he'll fix
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.in b/configure.in index c96056b3e92..ab6d5e4c0be 100644 --- a/configure.in +++ b/configure.in @@ -1537,6 +1537,19 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then OPTIMIZE_CXXFLAGS="-O3 -DNDEBUG" fi +# If the user specified CFLAGS, we won't add any optimizations +if test -n "$SAVE_CFLAGS" +then + OPTIMIZE_CFLAGS="" + DEBUG_OPTIMIZE_CC="" +fi +# Ditto for CXXFLAGS +if test -n "$SAVE_CXXFLAGS" +then + OPTIMIZE_CXXFLAGS="" + DEBUG_OPTIMIZE_CXX="" +fi + AC_ARG_WITH(debug, [ --without-debug Build a production version without debugging code], [with_debug=$withval], |