summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-11-17 10:59:21 -0800
committerjimw@mysql.com <>2005-11-17 10:59:21 -0800
commitc1261f588fe999773f56a3a8860309891dce53a4 (patch)
tree6d7916f2cf7df4322ffa600db44b47a7ca681877 /configure.in
parentcee6671756bb88ef20b9d1eeaa0e695896f53eb7 (diff)
parent592a4c7cb385e8fa7b6f9355a6c072aa56179b82 (diff)
downloadmariadb-git-c1261f588fe999773f56a3a8860309891dce53a4.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-12640
into mysql.com:/home/jimw/my/mysql-4.1-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 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],