diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 2f1b83c5e5f..50d3405a81c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-07  Alexandre Oliva  <aoliva@redhat.com>
+
+	* test_summary (configflags): Compute correctly with both
+	autoconfiscated and Cygnus-style top-level.
+
 2003-01-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc_update (files_and_dependencies): Add gcc/cp/cfns.h depends
diff --git a/contrib/test_summary b/contrib/test_summary
index 5b9cdc8f39e..377f9e5df0d 100755
--- a/contrib/test_summary
+++ b/contrib/test_summary
@@ -94,16 +94,19 @@ BEGIN {
   print "cat <<'"'"'EOF'"'"' |";
 '${prepend_logs+"  system(\"cat $prepend_logs\"); "}'
 }
-$1 ~ /\/configure$/ {
-    srcdir = $1;
-    gsub(/\/configure$/, "", srcdir);
+$0 ~ /^(|# )[^ ]*\/configure / {
+    configflags = $0 " ";
+    gsub(/^# /, "", configflags);
+    srcdir = configflags;
+    gsub(/\/configure .*/, "", srcdir);
     printf "LAST_UPDATED: ";
     system("tail -1 " srcdir "/LAST_UPDATED");
     print "";
 
-    $1 = "configure flags:"; configflags = $0;
-    gsub(/--with-gcc-version-trigger=[^ ]* /, "", configflags);
-    gsub(/ --norecursion/, "", configflags)
+    gsub(/^[^ ]*\/configure /, "configure flags: ", configflags);
+    gsub(/ --with-gcc-version-trigger=[^ ]* /, " ", configflags);
+    gsub(/ --norecursion /, " ", configflags);
+    gsub(/ $/, "", configflags);
 }
 /^Running target / { print ""; print; }
 /^Target / { if (host != "") next; else host = $3; }