Index: /mpich2/trunk/confdb/aclocal_cc.m4
===================================================================
--- /mpich2/trunk/confdb/aclocal_cc.m4 (revision 4877)
+++ /mpich2/trunk/confdb/aclocal_cc.m4 (revision 4878)
@@ -1099,5 +1099,43 @@
     #                              a zero-length format string is very well defined
 
-    pac_common_strict_flags="-O2 -Wall -Wextra -Wno-missing-field-initializers -Wno-type-limits -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL -Wno-unused-parameter -Wno-unused-label -Wshadow -Wmissing-declarations -Wno-long-long -Wfloat-equal -Wdeclaration-after-statement -Wundef -Wno-endif-labels -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wno-sign-compare -Waggregate-return -Wold-style-definition -Wmissing-noreturn -Wno-multichar -Wno-deprecated-declarations -Wpacked -Wnested-externs -Winvalid-pch -Wno-pointer-sign -Wvariadic-macros -std=c89 -Wno-format-zero-length"
+    # the embedded newlines in this string are safe because we evaluate each
+    # argument in the for-loop below and append them to the CFLAGS with a space
+    # as the separator instead
+    pac_common_strict_flags="
+        -O2
+        -Wall
+        -Wextra
+        -Wno-missing-field-initializers
+        -Wno-type-limits
+        -Wstrict-prototypes
+        -Wmissing-prototypes
+        -DGCC_WALL
+        -Wno-unused-parameter
+        -Wno-unused-label
+        -Wshadow
+        -Wmissing-declarations
+        -Wno-long-long
+        -Wfloat-equal
+        -Wdeclaration-after-statement
+        -Wundef
+        -Wno-endif-labels
+        -Wpointer-arith
+        -Wbad-function-cast
+        -Wcast-align
+        -Wwrite-strings
+        -Wno-sign-compare
+        -Waggregate-return
+        -Wold-style-definition
+        -Wmissing-noreturn
+        -Wno-multichar
+        -Wno-deprecated-declarations
+        -Wpacked
+        -Wnested-externs
+        -Winvalid-pch
+        -Wno-pointer-sign
+        -Wvariadic-macros
+        -std=c89
+        -Wno-format-zero-length
+    "
     pac_cc_strict_flags=""
     case "$1" in