Index: MPI-2-C++/configure
===================================================================
RCS file: /MPIhome/MPI-2-C++/configure,v
retrieving revision 1.26
diff -r1.26 configure
1518a1519,1528
> 	    elif test "$MPICH_VERSION" = "1.2.7."; then
> 		cat >> confdefs.h <<\EOF
> #define MPI2CPP_MPICH121 1
> EOF
> 
> 		echo "$ac_t""1.2.7 (good)" 1>&6
> 		WANT_UPGRADE=0
> 		if test -z "$MPICH_BIN"; then
> 		    { echo "configure: error: when configuring for 1.2.7, --with-mpichbin must be specified" 1>&2; exit 1; }
> 		fi
2225a2236,2240
> #
> # Note that PROG_CXX looks in CCC, not CXX !!
> if test -z "$CCC" -a -n "$CXX" ; then
>     CCC="$CXX"
> fi
Index: MPI-2-C++/configure.in
===================================================================
RCS file: /MPIhome/MPI-2-C++/configure.in,v
retrieving revision 1.24
diff -r1.24 configure.in
465a466,472
> 	    elif test "$MPICH_VERSION" = "1.2.7."; then
> 		AC_DEFINE(MPI2CPP_MPICH121)
> 		AC_MSG_RESULT([1.2.7 (good)])
> 		WANT_UPGRADE=0
> 		if test -z "$MPICH_BIN"; then
> 		    AC_MSG_ERROR([when configuring for 1.2.7, --with-mpichbin must be specified])
> 		fi
1007a1015,1019
> #
> # Note that PROG_CXX looks in CCC, not CXX !!
> if test -z "$CCC" -a -n "$CXX" ; then
>     CCC="$CXX"
> fi
Index: src/fortran/src/mpif77.in
===================================================================
RCS file: /MPIhome/mpich/src/fortran/src/mpif77.in,v
retrieving revision 1.27.2.1
retrieving revision 1.28
diff -r1.27.2.1 -r1.28
288c288
< 	trap "$Show rm -f mpif.h" 0
---
> 	trap "$Show rm mpif.h" 0
295a296,299
> if [ $HasDashC = 1 -a $DoCompile = 0 -a $DoLink = 0 ] ; then
>     # Specified -c but no files.  Try to force -c behavior from compiler
>     DoCompile=1
> fi
Index: src/fortran/src/mpif90.in
===================================================================
RCS file: /MPIhome/mpich/src/fortran/src/mpif90.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -r1.18 -r1.19
343a344,347
> if [ $HasDashC = 1 -a $DoCompile = 0 -a $DoLink = 0 ] ; then
>     # Specified -c but no files.  Try to force -c behavior from compiler
>     DoCompile=1
> fi
Index: util/mpicc.in
===================================================================
RCS file: /MPIhome/mpich/util/mpicc.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -r1.49 -r1.50
317a318,321
> if [ $HasDashC = 1 -a $DoCompile = 0 -a $DoLink = 0 ] ; then
>     # Specified -c but no files.  Try to force -c behavior from compiler
>     DoCompile=1
> fi

.