summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-11-19 11:11:09 +0100
committerunknown <kent@mysql.com>2005-11-19 11:11:09 +0100
commit34bbdf061368904acdf036b5cfdd4d7ad773190c (patch)
tree1692169f87cd6be427c308c7b6fd586e37f2c71b /configure.in
parent2e7c3675194ada4924e09a06275e4268a3618d78 (diff)
parent421dadf74fd436b10b6bad46d8f370748a4d318b (diff)
downloadmariadb-git-34bbdf061368904acdf036b5cfdd4d7ad773190c.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck 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 fc21723982f..9894426b581 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],