Moved things to configure.in

innobase/configure.in

@@ -51,8 +51,8 @@ then
   CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
 else
   # Optimized version. No debug
-  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
-  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
+  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS -DDEBUG_OFF"
+  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS -DDEBUG_OFF"
 fi
 
 case "$target_os" in

innobase/include/Makefile.i

@@ -4,7 +4,5 @@ libsdir = ../libs
 
 INCLUDES =		-I../../include -I../include
 
-CFLAGS= -g -O2 -DDEBUG_OFF
-
 # Don't update the files from bitkeeper
 %::SCCS/s.%