diff --git a/ChangeLog b/ChangeLog
index e9d4ac2290..0173b592c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 13 18:58:04 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (CFLAGS, CXXFLAGS): moved after warnflags.
+
 Fri Mar 13 18:10:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_eval.c (rb_throw_obj): inverted call flow.  [ruby-core:22872]
diff --git a/configure.in b/configure.in
index 6cbd8ecbd1..f1400a842a 100644
--- a/configure.in
+++ b/configure.in
@@ -221,8 +221,6 @@ if test "$GCC" = yes; then
 else
     linker_flag=
 fi
-CFLAGS="${CFLAGS} `eval echo $cflags`"
-CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
 
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
@@ -335,6 +333,9 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
     warnflags="-Wall -Wno-unused-parameter -Wno-parentheses ${warnflags+$warnflags }-Wpointer-arith -Wwrite-strings"
 fi
 
+CFLAGS="${CFLAGS} `eval echo $cflags`"
+CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
+
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
 : > confdefs.h