summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-11-17 13:37:30 -0800
committerjimw@mysql.com <>2005-11-17 13:37:30 -0800
commitf8ce7bc01e105c1be0cb6f121f0f6798c40b7b81 (patch)
tree0469b3757df7cbb4eec77b1666376cc27926bcff /configure.in
parenta42b3730aa2fa654cc90d9649f61b4e56ce35734 (diff)
parente21566e9083f25e2e2eaab3bdc000dbc6a0015cd (diff)
downloadmariadb-git-f8ce7bc01e105c1be0cb6f121f0f6798c40b7b81.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 52dec85df8c..cf132e4f4cc 100644
--- a/configure.in
+++ b/configure.in
@@ -1587,6 +1587,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],