summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-11-17 10:59:21 -0800
committerunknown <jimw@mysql.com>2005-11-17 10:59:21 -0800
commit58196d39d4f6db7a0f1515db64e53f64c8b1a005 (patch)
tree6d7916f2cf7df4322ffa600db44b47a7ca681877 /configure.in
parentab816dca913fbc0d45733d836b88cf6a00c4da53 (diff)
parent8355bce65862d3effea30f20f12186c8000b0247 (diff)
downloadmariadb-git-58196d39d4f6db7a0f1515db64e53f64c8b1a005.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-12640
into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged
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 f3354cfa981..6792a797e6c 100644
--- a/configure.in
+++ b/configure.in
@@ -1672,6 +1672,19 @@ if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
OPTIMIZE_CXXFLAGS="$OPTIMIZE_CXXFLAGS -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],