bk commit into 4.1 tree (jimw:1.2452) BUG#12640

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2452 05/11/02 18:29:06 jimw@stripped +1 -0
  Don't add optimization flags to CFLAGS if the user specified their
  own CFLAGS (ditto for CXXFLAGS). (Bug #12640)

  configure.in
    1.398 05/11/02 18:29:03 jimw@stripped +13 -0
    Only add optimization flags when no CFLAGS (and/or CXXFLAGS) were specified.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-12640

--- 1.397/configure.in	2005-10-12 13:28:43 -07:00
+++ 1.398/configure.in	2005-11-02 18:29:03 -08:00
@@ -1672,6 +1672,19 @@
   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],