diff --git a/ChangeLog b/ChangeLog
index a842b61c193..10e6e0892f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
 
+	* configure.in: Move definition of libstdcxx_flags
+	right above usage, rather than waaay earlier.
+
 	* configure.in: Pull definition of is_cross_compiler earlier.
 
 	* configure.in: Rearrange a little.
diff --git a/configure.in b/configure.in
index 334fc70a3cd..49194021c45 100644
--- a/configure.in
+++ b/configure.in
@@ -127,9 +127,6 @@ else
   is_cross_compiler=yes
 fi	
 
-# Don't use libstdc++-v3's flags to configure/build itself.
-libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
-
 # Work in distributions that contain no compiler tools, like Autoconf.
 tentative_cc=""
 if test -d ${srcdir}/config ; then
@@ -1558,6 +1555,9 @@ case $GCJ_FOR_TARGET in
 *) GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
 esac
 
+# Don't use libstdc++-v3's flags to configure/build itself.
+libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+
 if test "x${CXX_FOR_TARGET+set}" = xset; then
   :
 elif test -d ${topsrcdir}/gcc; then