- up to 1.2.5-1a, updated fuckssh and opt patches

- removed obsolete DESTDIR patch

Changed files:
    mpich-DESTDIR.patch -> 1.3
    mpich-fuckssh.patch -> 1.2
    mpich-opt.patch -> 1.2
    mpich.spec -> 1.2

4 files changed, 245 insertions, 477 deletions

diff --git a/mpich-DESTDIR.patch b/mpich-DESTDIR.patch
deleted file mode 100644
index 01a08b9..0000000
--- a/mpich-DESTDIR.patch
+++ /dev/null
@@ -1,249 +0,0 @@
---- mpich-1.2.1/util/mpiinstall.in.orig	Thu Aug 24 18:21:36 2000
-+++ mpich-1.2.1/util/mpiinstall.in	Wed May 30 05:16:53 2001
-@@ -38,22 +38,22 @@
- MAKE="@MAKE@"
- RSHCOMMAND="@RSHCOMMAND@"
- NOMPE=@NOMPE@
--SHAREDLIB_LOCALDIR=@SHAREDLIB_LOCALDIR@
-+SHAREDLIB_LOCALDIR=${DESTDIR}@SHAREDLIB_LOCALDIR@
- MPIR_HOME=@MPIR_HOME@
- #
- # Default paths (set at configure time)
-     exec_prefix=@exec_prefix@
--    bindir=@bindir@
--    sbindir=@sbindir@
--    includedir=@includedir@
--    sysconfdir=@sysconfdir@
--    libdir=@libdir@
--    sharedlib_dir=@sharedlib_dir@
--    messagecat_dir=@messagecat_dir@
--    mandir=@mandir@
--    htmldir=@htmldir@
--    datadir=@datadir@
--    docdir=@docdir@
-+    bindir=${DESTDIR}@bindir@
-+    sbindir=${DESTDIR}@sbindir@
-+    includedir=${DESTDIR}@includedir@
-+    sysconfdir=${DESTDIR}@sysconfdir@
-+    libdir=${DESTDIR}@libdir@
-+    sharedlib_dir=${DESTDIR}@sharedlib_dir@
-+    messagecat_dir=${DESTDIR}@messagecat_dir@
-+    mandir=${DESTDIR}@mandir@
-+    htmldir=${DESTDIR}@htmldir@
-+    datadir=${DESTDIR}@datadir@
-+    docdir=${DESTDIR}@docdir@
- # Location of sources
- top_srcdir=@top_srcdir@
- #
-@@ -427,7 +427,7 @@
- if [ -d $prefix ] ; then
-     if [ $verbose = 1 ] ; then echo "using existing directory $prefix" ; fi
- else
--    MkDir $prefix 
-+    MkDir ${DESTDIR}$prefix 
- fi
- 
- # 
-@@ -446,9 +446,9 @@
- MkDir $docdir
- MkDir $sysconfdir
- 
--MkDir $prefix/examples
-+MkDir ${DESTDIR}$prefix/examples
- if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
--    MkDir $prefix/examples/$CPP_DIR
-+    MkDir ${DESTDIR}$prefix/examples/$CPP_DIR
-     MkDir $includedir/mpi2c++
- fi
- 
-@@ -868,7 +868,7 @@
- CopyFile $top_srcdir/util/cleanipcs $sbindir $XMODE
- #
- # Example programs
--CopyFile $top_srcdir/installtest/Makefile.in $prefix/examples
-+CopyFile $top_srcdir/installtest/Makefile.in ${DESTDIR}$prefix/examples
- #
- # This SHOULD use mpireconfig...
- Savevar=$prefix
-@@ -876,44 +876,44 @@
- # prefix=@prefix@ when ever prefix= starts in the first column (!)
- # It also does this with exec_prefix (!!)
-      prefix=$APREFIX
--(cd $prefix/examples ; $bindir/mpireconfig Makefile )
--echo "(cd $prefix/examples ; $MAKE clean)" >> $UNINSTALLFILE
--echo "/bin/rm -f $prefix/examples/Makefile" >> $UNINSTALLFILE
-+(cd ${DESTDIR}$prefix/examples ; $bindir/mpireconfig Makefile )
-+echo "(cd ${DESTDIR}$prefix/examples ; $MAKE clean)" >> $UNINSTALLFILE
-+echo "/bin/rm -f ${DESTDIR}$prefix/examples/Makefile" >> $UNINSTALLFILE
-      prefix=$Savevar
--CopyFile $prefix/examples/Makefile $datadir/Makefile.sample
--CopyFile $top_srcdir/installtest/cpi.c $prefix/examples
--CopyFile $top_srcdir/installtest/cpip.c $prefix/examples
--CopyFile $top_srcdir/installtest/cpilog.c $prefix/examples
--CopyFile $top_srcdir/installtest/hello++.cc $prefix/examples
-+CopyFile ${DESTDIR}$prefix/examples/Makefile $datadir/Makefile.sample
-+CopyFile $top_srcdir/installtest/cpi.c ${DESTDIR}$prefix/examples
-+CopyFile $top_srcdir/installtest/cpip.c ${DESTDIR}$prefix/examples
-+CopyFile $top_srcdir/installtest/cpilog.c ${DESTDIR}$prefix/examples
-+CopyFile $top_srcdir/installtest/hello++.cc ${DESTDIR}$prefix/examples
- if [ "@NOF77@" = "0" ] ; then
--    CopyFile $top_srcdir/installtest/pi3.f $prefix/examples
--    CopyFile $top_srcdir/installtest/pi3p.f $prefix/examples
-+    CopyFile $top_srcdir/installtest/pi3.f ${DESTDIR}$prefix/examples
-+    CopyFile $top_srcdir/installtest/pi3p.f ${DESTDIR}$prefix/examples
-     if [ "@NO_F90@" = "0" ] ; then
--        CopyFile $top_srcdir/installtest/pi3f90.f90 $prefix/examples
-+        CopyFile $top_srcdir/installtest/pi3f90.f90 ${DESTDIR}$prefix/examples
-     fi
- fi
- if [ -s $top_srcdir/romio/test/simple.c ] ; then 
--    CopyFile $top_srcdir/romio/test/simple.c $prefix/examples/simpleio.c
-+    CopyFile $top_srcdir/romio/test/simple.c ${DESTDIR}$prefix/examples/simpleio.c
- fi
--CopyFile $top_srcdir/installtest/README $prefix/examples
-+CopyFile $top_srcdir/installtest/README ${DESTDIR}$prefix/examples
- #
- # Test build the examples
--$Show "(cd $prefix/examples ; /bin/rm -f mpirun ; \
-+$Show "(cd ${DESTDIR}$prefix/examples ; /bin/rm -f mpirun ; \
- 	  ln -s ../bin/mpirun mpirun )"
--echo "/bin/rm -f $prefix/examples/mpirun" >> $UNINSTALLFILE
-+echo "/bin/rm -f ${DESTDIR}$prefix/examples/mpirun" >> $UNINSTALLFILE
- #
- echo "About to run installation test..."
--$Show "(cd $prefix/examples; $MAKE all ; $MAKE clean )"
-+$Show "(cd ${DESTDIR}$prefix/examples; $MAKE all ; $MAKE clean )"
- if [ @SHAREDKIND@ != "ignore" ] ; then
-     echo "About to run installation test for shared libraries ..."
--    $Show "(cd $prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
-+    $Show "(cd ${DESTDIR}$prefix/examples; MPICH_USE_SHLIB="yes"; export MPICH_USE_SHLIB; $MAKE all ; $MAKE clean )"
- fi
- #
- # This SHOULD use mpireconfig...
- Savevar=$prefix
- if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then 
-     # C++ Example programs 
--    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in $prefix/examples/$CPP_DIR
-+    CopyFile $top_srcdir/installtest/mpi-2-c++/Makefile.in ${DESTDIR}$prefix/examples/$CPP_DIR
-     #
-     prefix=$APREFIX
-     CPPEXDIR=$top_srcdir/$CPP_DIR/contrib/examples
-@@ -921,25 +921,25 @@
-     # the C++ examples Makefile, particularly the TEMPLATE_REP field
-     # The intent here is to update the directories; but we also need
-     # to update a few additional fields
--    (cd $prefix/examples/$CPP_DIR ; $bindir/mpireconfig Makefile )
--    echo "(cd $prefix/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
--    echo "/bin/rm -f $prefix/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
-+    (cd ${DESTDIR}$prefix/examples/$CPP_DIR ; $bindir/mpireconfig Makefile )
-+    echo "(cd ${DESTDIR}$prefix/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE
-+    echo "/bin/rm -f ${DESTDIR}$prefix/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE
-     prefix=$Savevar
--    CopyFile $CPPEXDIR/hello_world.cc $prefix/examples/$CPP_DIR
--    CopyFile $CPPEXDIR/ring.cc $prefix/examples/$CPP_DIR
--    CopyFile $CPPEXDIR/topology.cc $prefix/examples/$CPP_DIR
--    CopyFile $CPPEXDIR/user_bcast.cc $prefix/examples/$CPP_DIR
--    CopyFile $CPPEXDIR/chapter_10_mpi2.cc $prefix/examples/$CPP_DIR
--    CopyFile $CPPEXDIR/pi.cc $prefix/examples/$CPP_DIR
--    CopyFile $CPPEXDIR/README $prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/hello_world.cc ${DESTDIR}$prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/ring.cc ${DESTDIR}$prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/topology.cc ${DESTDIR}$prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/user_bcast.cc ${DESTDIR}$prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/chapter_10_mpi2.cc ${DESTDIR}$prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/pi.cc ${DESTDIR}$prefix/examples/$CPP_DIR
-+    CopyFile $CPPEXDIR/README ${DESTDIR}$prefix/examples/$CPP_DIR
-     #
-     # Test build the C++ examples
--    $Show "(cd $prefix/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
-+    $Show "(cd ${DESTDIR}$prefix/examples/$CPP_DIR ; /bin/rm -f mpirun ; \
- 	      ln -s ../../bin/mpirun mpirun )"
--    echo "/bin/rm -f $prefix/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
-+    echo "/bin/rm -f ${DESTDIR}$prefix/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE
-     #
-     echo "About to run C++ installation test..."
--    $Show "(cd $prefix/examples/$CPP_DIR; $MAKE ; $MAKE clean)"
-+    $Show "(cd ${DESTDIR}$prefix/examples/$CPP_DIR; $MAKE ; $MAKE clean)"
-     #
- fi
- #
---- mpich-1.2.1/mpe/sbin/mpeinstall.in.orig	Fri Aug 25 17:03:17 2000
-+++ mpich-1.2.1/mpe/sbin/mpeinstall.in	Wed May 30 06:23:17 2001
-@@ -29,12 +29,13 @@
- # Installation directories: Default paths (set at configure time)
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--includedir=@includedir@
--libdir=@libdir@
--bindir=@bindir@
--sbindir=@sbindir@
--datadir=@datadir@
--sysconfdir=@sysconfdir@
-+PREFIX=@prefix@
-+includedir=${DESTDIR}@includedir@
-+libdir=${DESTDIR}@libdir@
-+bindir=${DESTDIR}@bindir@
-+sbindir=${DESTDIR}@sbindir@
-+datadir=${DESTDIR}@datadir@
-+sysconfdir=${DESTDIR}@sysconfdir@
- 
- PROF_LIBNAME=@PROF_LIBNAME@
- CPRP="@CPRP@"
-@@ -83,7 +83,9 @@
-     case "$arg" in
- 	-prefix=*)
- 	    prefix=`echo $arg | sed -e 's/-prefix=//g'` 
--	    prefix_override=1
-+	    if [ "$prefix" != "$PREFIX" ]; then
-+	    	prefix_override=1
-+	    fi
- 	    ;;
- 	-uninstall=*)
- 	    UNINSTALLFILE=`echo A$arg | sed -e 's/A-uninstall=//g'` 
-@@ -345,7 +345,7 @@
- if [ -d $prefix ] ; then
-     if [ $verbose = 1 ] ; then echo "using existing directory $prefix" ; fi
- else
--    MkDir $prefix
-+    MkDir ${DESTDIR}$prefix
- fi
- 
- # echo "prefix = $prefix"
---- mpich-1.2.1/mpe/viewers/sbin/install-viewers.in.orig	Fri Jul  7 22:59:03 2000
-+++ mpich-1.2.1/mpe/viewers/sbin/install-viewers.in	Wed May 30 06:25:03 2001
-@@ -26,9 +26,10 @@
- # Installation directories: Default paths (set at configure time)
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--bindir=@bindir@
--sbindir=@sbindir@
--datadir=@datadir@
-+PREFIX=@prefix@
-+bindir=${DESTDIR}@bindir@
-+sbindir=${DESTDIR}@sbindir@
-+datadir=${DESTDIR}@datadir@
- 
- # File access mode
- MODE=0664
-@@ -70,8 +70,10 @@
-     case "$arg" in
-         -prefix=*)
-             prefix=`echo $arg | sed -e 's/-prefix=//'`
--            prefix_override=1
--            ;;
-+	    if [ "$prefix" != "$PREFIX" ]; then
-+                prefix_override=1
-+	    fi
-+	    ;;
-         -uninstall=*)
-             UNINSTALLFILE=`echo A$arg | sed -e 's/A-uninstall=//g'`
- 	    appendUninstall=1
-@@ -333,7 +333,7 @@
- if [ -d $prefix ] ; then
-     if [ $verbose = 1 ] ; then echo "using existing directory $prefix" ; fi
- else
--    MkDir $prefix
-+    MkDir ${DESTDIR}$prefix
- fi
- 
- if [ "$prefix_override" = 1 ] ; then
diff --git a/mpich-fuckssh.patch b/mpich-fuckssh.patch
index 6343f7d..d039754 100644
--- a/mpich-fuckssh.patch
+++ b/mpich-fuckssh.patch
@@ -1,7 +1,6 @@
-diff -urN mpich-1.2.1/mpid/ch_p4/configure mpich-1.2.1-new/mpid/ch_p4/configure
---- mpich-1.2.1/mpid/ch_p4/configure	Tue Aug 22 21:36:07 2000
-+++ mpich-1.2.1-new/mpid/ch_p4/configure	Tue Mar 20 01:53:37 2001
-@@ -1140,6 +1140,7 @@
+--- mpich-1.2.5/mpid/ch_p4/configure.orig	Fri Oct  4 23:22:22 2002
++++ mpich-1.2.5/mpid/ch_p4/configure	Sat Apr  5 09:46:24 2003
+@@ -1165,6 +1165,7 @@
    ;;
  esac
  fi
@@ -9,13 +8,13 @@ diff -urN mpich-1.2.1/mpid/ch_p4/configure mpich-1.2.1-new/mpid/ch_p4/configure
  RSHCOMMAND="$ac_cv_path_RSHCOMMAND"
  if test -n "$RSHCOMMAND"; then
    echo "$ac_t""$RSHCOMMAND" 1>&1
-@@ -1148,25 +1149,12 @@
+@@ -1173,22 +1174,8 @@
  fi
  
          if test -n "$RSHCOMMAND" ; then
 -	    echo $ac_n "checking whether $RSHCOMMAND works""... $ac_c" 1>&1
--echo "configure:1153: checking whether $RSHCOMMAND works" >&2
--            output=`$RSHCOMMAND $machine -n true 2>&1`
+-echo "configure:1178: checking whether $RSHCOMMAND works" >&2
+-            output=`$RSHCOMMAND $machine -n true 2>&1 </dev/null`
 -            if test -n "$output" ; then
 -		echo "$ac_t""no" 1>&1
 -		echo "Errors while trying to run true on $machine with $program"
@@ -31,6 +30,29 @@ diff -urN mpich-1.2.1/mpid/ch_p4/configure mpich-1.2.1-new/mpid/ch_p4/configure
 -	    fi
          fi
      done
+     # Check ssh with special options to avoid user prompting which causes the
+@@ -1229,25 +1216,11 @@
+ fi
+ 
+     	if test -n "$RSHCOMMAND" ; then
+-    	    echo $ac_n "checking whether $RSHCOMMAND works""... $ac_c" 1>&1
+-echo "configure:1235: checking whether $RSHCOMMAND works" >&2
+-    	    output=`$RSHCOMMAND -o "StrictHostKeyChecking no" \
+-    	      -o "BatchMode yes" $machine -n true 2>&1 </dev/null`
+-    	    if test $? -ne 0 ; then
+-    		echo "$ac_t""no" 1>&1
+-    		echo "Errors while trying to run true on $machine with ssh"
+-    		echo "$output"
+-    		RSHCOMMAND=""
+-    		# HORRIBLE, TERRIBLE BUG in AUTOCONF!!!
+-    		# It is determined to INCORRECTLY remember some results,
+-    		# while forgetting others (like "cross-compiling")
+-    		unset ac_cv_path_RSHCOMMAND
+-    	    else
+     		echo "$ac_t""yes" 1>&1
+-    	    fi
+     	fi
+     fi
  fi
 +set +x
  if test -z "$RSHCOMMAND" ; then
diff --git a/mpich-opt.patch b/mpich-opt.patch
index d356080..1bc8010 100644
--- a/mpich-opt.patch
+++ b/mpich-opt.patch
@@ -9,12 +9,12 @@
  
  # See mpid/ch_adi2/Makefile.in for a full list
  SOURCE   = adi2recv.c adi2send.c adi2init.c adi2probe.c adi2ssend.c \
---- mpich-1.2.1/src/env/Makefile.in.orig	Tue Sep  5 16:23:17 2000
-+++ mpich-1.2.1/src/env/Makefile.in	Tue May 29 22:28:29 2001
+--- mpich-1.2.5/src/env/Makefile.in.orig	Tue Sep  5 16:23:17 2000
++++ mpich-1.2.5/src/env/Makefile.in	Tue May 29 22:28:29 2001
 @@ -116,10 +116,10 @@
  # the MPI libraries will work
  msgqdllloc.o: ${top_srcdir}/src/env/msgqdllloc.c
- 	if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
+ 	@if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
 -	  ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
 +	  ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
  	  -DMPICH_INFODLL_LOC='"@libdir@/libtvmpich.so"' ${top_srcdir}/src/env/msgqdllloc.c ; \
@@ -24,12 +24,12 @@
  	fi
  
  .c.o:
---- mpich-1.2.1/src/infoexport/Makefile.in.orig	Fri Jan 14 21:58:04 2000
-+++ mpich-1.2.1/src/infoexport/Makefile.in	Tue May 29 22:50:47 2001
-@@ -6,7 +6,7 @@
- libbuild_dir      = @libbuild_dir@
+--- mpich-1.2.5/src/infoexport/Makefile.in.orig	Fri Jan 14 21:58:04 2000
++++ mpich-1.2.5/src/infoexport/Makefile.in	Tue May 29 22:50:47 2001
+@@ -7,7 +7,7 @@
  
- DEFS        = @DEFS@ ${MPIPROFILE} -I. -I${srcdir} @mpich_includes@
+ # Define FOR_MPI2=1 to enable some MPI-2 support
+ DEFS        = @DEFS@ ${MPIPROFILE} -I. -I${srcdir} @mpich_includes@ -DFOR_MPI2=0
 -CFLAGS      = -g @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
 +CFLAGS      = @OPTFLAGS@ @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
  
@@ -57,8 +57,8 @@
  fi
  
  
---- mpich-1.2.1/configure.in.orig	Tue Aug 29 23:52:53 2000
-+++ mpich-1.2.1/configure.in	Tue May 29 23:05:24 2001
+--- mpich-1.2.5/configure.in.orig	Tue Aug 29 23:52:53 2000
++++ mpich-1.2.5/configure.in	Tue May 29 23:05:24 2001
 @@ -3075,6 +3075,8 @@
    export TESTCC ;\
    export TESTF77 ;\
@@ -68,8 +68,27 @@
    export mpich_includes ;\
    export LIB_PATH ;\
    export BASE_LIB_LIST ;\
---- mpich-1.2.1/configure.orig	Tue Aug 29 23:52:24 2000
-+++ mpich-1.2.1/configure	Tue May 29 23:09:00 2001
+@@ -3193,8 +3193,8 @@
+ 	    -mpibindir=$binbuild_dir \
+             -mpilib=$libbuild_dir/lib$MPILIBNAME.a \
+             -mpiolib=$libbuild_dir/lib$MPILIBNAME.a \
+-            -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT" \
+-            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT" \
++            -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT $OPTFLAGSC $OPTFLAGS" \
++            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT $OPTFLAGSF $OPTFLAGS" \
+ 	    -f90="$F90" $romio_config_args $enable_args $with_args )
+   /bin/rm -f include/mpio.h ${top_srcdir}/include/mpio.h
+   cp romio/include/mpio.h include
+@@ -3270,6 +3270,7 @@
+                                   --prefix=${prefix} $enable_args $with_args \
+                                   --libdir=${libdir} --bindir=${bindir} \
+ 				  --includedir=${includedir} \
++				  --with-cflags="$OPTFLAGSC $OPTFLAGS" \
+ 				  $MPE_ARGS )
+     if test $? = 0 ; then
+         echo "Done configuring MPE Profiling Libraries" ; echo
+--- mpich-1.2.5/configure.orig	Tue Aug 29 23:52:24 2000
++++ mpich-1.2.5/configure	Tue May 29 23:09:00 2001
 @@ -13517,6 +13517,8 @@
    export TESTCC ;\
    export TESTF77 ;\
@@ -79,35 +98,57 @@
    export mpich_includes ;\
    export LIB_PATH ;\
    export BASE_LIB_LIST ;\
---- mpich-1.2.1/configure.in.orig	Tue May 29 23:17:33 2001
-+++ mpich-1.2.1/configure.in	Wed May 30 00:18:31 2001
-@@ -3193,8 +3193,8 @@
- 	    -mpibindir=$binbuild_dir \
-             -mpilib=$libbuild_dir/lib$MPILIBNAME.a \
-             -mpiolib=$libbuild_dir/lib$MPILIBNAME.a \
--            -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT" \
--            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT" -f90="$F90" $romio_config_args )
-+            -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT $OPTFLAGSC $OPTFLAGS" \
-+            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT $OPTFLAGSF $OPTFLAGS" -f90="$F90" $romio_config_args )
-   /bin/rm -f include/mpio.h ${top_srcdir}/include/mpio.h
-   cp romio/include/mpio.h include
-   ROMIO_LFLAGS="`$MAKE -f romio/Makefile romio_lflags`"
---- mpich-1.2.1/configure.orig	Tue May 29 23:17:34 2001
-+++ mpich-1.2.1/configure	Wed May 30 00:19:09 2001
 @@ -13723,8 +13723,8 @@
  	    -mpibindir=$binbuild_dir \
              -mpilib=$libbuild_dir/lib$MPILIBNAME.a \
              -mpiolib=$libbuild_dir/lib$MPILIBNAME.a \
 -            -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT" \
--            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT" -f90="$F90" $romio_config_args )
+-            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT" \
 +            -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT $OPTFLAGSC $OPTFLAGS" \
-+            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT $OPTFLAGSF $OPTFLAGS" -f90="$F90" $romio_config_args )
++            -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT $OPTFLAGSF $OPTFLAGS" \
+ 	    -f90="$F90" $romio_config_args $enable_args $with_args )
    /bin/rm -f include/mpio.h ${top_srcdir}/include/mpio.h
    cp romio/include/mpio.h include
-   ROMIO_LFLAGS="`$MAKE -f romio/Makefile romio_lflags`"
---- mpich-1.2.1/romio/configure.in.orig	Fri Aug 25 19:24:48 2000
-+++ mpich-1.2.1/romio/configure.in	Wed May 30 00:23:42 2001
-@@ -387,8 +387,8 @@
+@@ -13800,6 +13800,7 @@
+                                   --prefix=${prefix} $enable_args $with_args \
+                                   --libdir=${libdir} --bindir=${bindir} \
+ 				  --includedir=${includedir} \
++				  --with-cflags="$OPTFLAGSC $OPTFLAGS" \
+ 				  $MPE_ARGS )
+     if test $? = 0 ; then
+         echo "Done configuring MPE Profiling Libraries" ; echo
+--- mpich-1.2.5/Makefile.in.orig	Tue Sep  5 22:06:05 2000
++++ mpich-1.2.5/Makefile.in	Wed May 30 01:07:43 2001
+@@ -327,7 +327,7 @@
+ 	CC="@CC@" ; export CC ; \
+ 	ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
+ 	if ${top_srcdir}/${CPP_DIR}/configure --with-mpich=.. \
+-			--with-libopt=" " \
++			--with-libopt="@OPTFLAGS@" \
+ 			 --with-profiling \
+ 			 --with-mpichbin=${binbuild_dir} \
+ 			 --with-mpichlib=${libbuild_dir} \
+@@ -467,6 +467,7 @@
+ serv_p4 server:
+ 	@if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi
+ 	@( cd mpid/server ; rm -f config.cache ; \
++	  CFLAGS="@OPTFLAGSC@ @OPTFLAGS@"; export CFLAGS ; \
+ 	  CC="@CC@" ; export CC ; MAKE="${MAKE}" ; export MAKE ; \
+ 	  ${top_srcdir}/mpid/server/configure ; $(MAKE) serv_p4 ; \
+ 	  cp serv_p4 $(binbuild_dir) )
+--- mpich-1.2.5/mpid/ch_p4/setup_ch_p4.orig	Fri Aug 18 21:45:14 2000
++++ mpich-1.2.5/mpid/ch_p4/setup_ch_p4	Wed May 30 05:11:02 2001
+@@ -253,6 +253,7 @@
+ echo "Configuring new p4 secure server"
+ (cd mpid/server ; \
+     CC="$CC" ; export CC ; \
++    CFLAGS="$OPTFLAGS"; export CFLAGS ; \
+     "$top_srcdir/mpid/server/configure" )
+ if test $? != 0 ; then
+     print_error "Configure of the secure server may have failed!"
+--- mpich-1.2.5/romio/configure.in.orig	Mon Jan 13 22:55:57 2003
++++ mpich-1.2.5/romio/configure.in	Sat Apr  5 11:05:59 2003
+@@ -505,8 +505,8 @@
      USER_CFLAGS="$CFLAGS -g"
      USER_FFLAGS="$FFLAGS -g"
  else
@@ -118,46 +159,50 @@
  fi
  #
  if test -n "$arch_sun4" ; then 
-@@ -396,12 +396,12 @@
-     F77=${FC:-f77}
-     if test $DEBUG = 1; then
+@@ -515,14 +515,14 @@
+     if test $DEBUG = "yes"; then
  	if test "$CC" = "gcc"; then
--           CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
-+           CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
+            dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
+-           CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
++           CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
  	else
-            CFLAGS="$CFLAGS -g -DAIO_SUN"
+            dnl CFLAGS="$CFLAGS -g -DAIO_SUN"
+            CFLAGS="$CFLAGS -g"
          fi
      else 
--        CFLAGS="$CFLAGS -O -DAIO_SUN"
-+        CFLAGS="$CFLAGS -DAIO_SUN"
+         dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -420,12 +420,12 @@
-     F77=${FC:-f77}
-     if test $DEBUG = 1; then
+     if test "$enable_aio" = "no" ; then
+         AC_DEFINE(NO_AIO)
+@@ -547,14 +547,14 @@
+     if test $DEBUG = "yes"; then
          if test "$CC" = "gcc" ; then
--            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
-+            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
+             dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
+-            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
++            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
          else 
-             CFLAGS="$CFLAGS -g -v -DAIO_SUN"
+             dnl CFLAGS="$CFLAGS -g -v -DAIO_SUN"
+             CFLAGS="$CFLAGS -g -v"
          fi
      else 
--        CFLAGS="$CFLAGS -O -DAIO_SUN"
-+        CFLAGS="$CFLAGS -DAIO_SUN"
+         dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -466,7 +466,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
+     if test "$enable_aio" = "no" ; then
+         AC_DEFINE(NO_AIO)
+@@ -605,7 +605,7 @@
+         CFLAGS="$CFLAGS -g"
      else 
--        CFLAGS="$CFLAGS -O -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
-+        CFLAGS="$CFLAGS -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
+         dnl CFLAGS="$CFLAGS -O -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -498,9 +498,9 @@
+     # Check that aio is available (many systems appear to have aio
+     # either installed improperly or turned off).
+@@ -661,9 +661,9 @@
          CFLAGS="$CFLAGS -g"
      else 
  	if test "$CC" = "icc"; then
@@ -169,7 +214,7 @@
          fi
      fi
      AR="ar860 cr$AR_LOCAL"
-@@ -530,9 +530,9 @@
+@@ -697,9 +697,9 @@
          CFLAGS="$CFLAGS -g $TFLOP_FLAGS"
      else
         if test "$CC" = "pgcc"; then
@@ -181,59 +226,61 @@
         fi
      fi
      AR="xar cr$AR_LOCAL"
-@@ -563,12 +563,12 @@
-     fi
-     if test $DEBUG = 1 ; then
+@@ -733,14 +733,14 @@
+     if test $DEBUG = "yes" ; then
  	if test "$CC" = "gcc" ; then
--            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
-+            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
+             dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
+-            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
++            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
          else
- 	    CFLAGS="$CFLAGS -g -DNO_AIO"
+ 	    dnl CFLAGS="$CFLAGS -g -DNO_AIO"
+ 	    CFLAGS="$CFLAGS -g"
          fi
      else 
--        CFLAGS="$CFLAGS -O -DNO_AIO"
-+        CFLAGS="$CFLAGS -DNO_AIO"
+         dnl CFLAGS="$CFLAGS -O -DNO_AIO"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -590,7 +590,7 @@
-         FFLAGS="$FFLAGS -g"
+     if test "$enable_aio" != "yes" ; then
+         AC_DEFINE(NO_AIO)
+@@ -795,7 +795,7 @@
      else
          USER_FFLAGS="$FFLAGS -Chopt"
--        CFLAGS="$CFLAGS -O -DNO_AIO -DSX4"
-+        CFLAGS="$CFLAGS -DNO_AIO -DSX4"
+         dnl CFLAGS="$CFLAGS -O -DNO_AIO -DSX4"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
          FFLAGS="$FFLAGS -Chopt"
      fi
-     if test -z "$MPI" ; then
-@@ -611,7 +611,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g +w1 -DNO_AIO"
+     AC_DEFINE(NO_AIO)
+@@ -820,7 +820,7 @@
+         CFLAGS="$CFLAGS -g +w1"
      else 
--        CFLAGS="$CFLAGS -O -DNO_AIO"
-+        CFLAGS="$CFLAGS -DNO_AIO"
+         dnl CFLAGS="$CFLAGS -O -DNO_AIO"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
+     AC_DEFINE(NO_AIO)
      RANLIB=":"
-     if test -z "$MPI"; then
-@@ -683,7 +683,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose -DAIO_PRIORITY_DEFAULT"
+@@ -898,7 +898,7 @@
+         CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
      else 
--        CFLAGS="$CFLAGS -O -DAIO_PRIORITY_DEFAULT"
-+        CFLAGS="$CFLAGS -DAIO_PRIORITY_DEFAULT"
+         dnl CFLAGS="$CFLAGS -O -DAIO_PRIORITY_DEFAULT"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
+     AC_DEFINE(AIO_PRIORITY_DEFAULT)
      MPI_LIB="$MPI_LIB -laio"
-     if test -z "$MPI" ; then
-@@ -711,7 +711,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g -DNO_AIO"
+@@ -930,7 +930,7 @@
+         CFLAGS="$CFLAGS -g"
      else 
--        CFLAGS="$CFLAGS -O -DNO_AIO"
-+        CFLAGS="$CFLAGS -DNO_AIO"
+         dnl CFLAGS="$CFLAGS -O -DNO_AIO"
+-        CFLAGS="$CFLAGS -O"
++        CFLAGS="$CFLAGS"
      fi
+     AC_DEFINE(NO_AIO)
      RANLIB=":"
-     CFLAGS="$CFLAGS -DCRAY -D_UNICOS"
-@@ -775,7 +775,7 @@
-     if test $DEBUG = 1; then
+@@ -1001,7 +1001,7 @@
+     if test $DEBUG = "yes"; then
          CFLAGS="$CFLAGS -g -fullwarn"
      else 
 -        CFLAGS="$CFLAGS -O"
@@ -241,9 +288,9 @@
      fi
     if test $osversion = 4 ; then
  	RANLIB="ar ts"
---- mpich-1.2.1/romio/configure.orig	Fri Aug 25 19:24:45 2000
-+++ mpich-1.2.1/romio/configure	Wed May 30 00:26:59 2001
-@@ -583,8 +583,8 @@
+--- mpich-1.2.5/romio/configure.orig	Mon Jan 13 22:55:58 2003
++++ mpich-1.2.5/romio/configure	Sat Apr  5 11:06:46 2003
+@@ -736,8 +736,8 @@
      USER_CFLAGS="$CFLAGS -g"
      USER_FFLAGS="$FFLAGS -g"
  else
@@ -254,46 +301,46 @@
  fi
  #
  if test -n "$arch_sun4" ; then 
-@@ -592,12 +592,12 @@
+@@ -745,12 +745,12 @@
      F77=${FC:-f77}
-     if test $DEBUG = 1; then
+     if test $DEBUG = "yes"; then
  	if test "$CC" = "gcc"; then
--           CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
-+           CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
+-                      CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
++                      CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
  	else
-            CFLAGS="$CFLAGS -g -DAIO_SUN"
+                       CFLAGS="$CFLAGS -g"
          fi
      else 
--        CFLAGS="$CFLAGS -O -DAIO_SUN"
-+        CFLAGS="$CFLAGS -DAIO_SUN"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -616,12 +616,12 @@
+     if test "$enable_aio" = "no" ; then
+         
+@@ -796,12 +796,12 @@
      F77=${FC:-f77}
-     if test $DEBUG = 1; then
+     if test $DEBUG = "yes"; then
          if test "$CC" = "gcc" ; then
--            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
-+            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
+-                        CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
++                        CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
          else 
-             CFLAGS="$CFLAGS -g -v -DAIO_SUN"
+                         CFLAGS="$CFLAGS -g -v"
          fi
      else 
--        CFLAGS="$CFLAGS -O -DAIO_SUN"
-+        CFLAGS="$CFLAGS -DAIO_SUN"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -706,7 +706,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
+     if test "$enable_aio" = "no" ; then
+         
+@@ -926,7 +926,7 @@
+     if test $DEBUG = "yes"; then
+                 CFLAGS="$CFLAGS -g"
      else 
--        CFLAGS="$CFLAGS -O -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
-+        CFLAGS="$CFLAGS -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -738,9 +738,9 @@
+     # Check that aio is available (many systems appear to have aio
+     # either installed improperly or turned off).
+@@ -1083,9 +1083,9 @@
          CFLAGS="$CFLAGS -g"
      else 
  	if test "$CC" = "icc"; then
@@ -305,7 +352,7 @@
          fi
      fi
      AR="ar860 cr$AR_LOCAL"
-@@ -770,9 +770,9 @@
+@@ -1150,9 +1150,9 @@
          CFLAGS="$CFLAGS -g $TFLOP_FLAGS"
      else
         if test "$CC" = "pgcc"; then
@@ -317,59 +364,59 @@
         fi
      fi
      AR="xar cr$AR_LOCAL"
-@@ -862,12 +862,12 @@
+@@ -1268,12 +1268,12 @@
      fi
-     if test $DEBUG = 1 ; then
+     if test $DEBUG = "yes" ; then
  	if test "$CC" = "gcc" ; then
--            CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
-+            CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
+-                        CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
++                        CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
          else
- 	    CFLAGS="$CFLAGS -g -DNO_AIO"
+ 	    	    CFLAGS="$CFLAGS -g"
          fi
      else 
--        CFLAGS="$CFLAGS -O -DNO_AIO"
-+        CFLAGS="$CFLAGS -DNO_AIO"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     if test -z "$MPI" ; then
-         MPI=mpich
-@@ -889,7 +889,7 @@
+     if test "$enable_aio" != "yes" ; then
+         
+@@ -1501,7 +1501,7 @@
          FFLAGS="$FFLAGS -g"
      else
          USER_FFLAGS="$FFLAGS -Chopt"
--        CFLAGS="$CFLAGS -O -DNO_AIO -DSX4"
-+        CFLAGS="$CFLAGS -DNO_AIO -DSX4"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
          FFLAGS="$FFLAGS -Chopt"
      fi
-     if test -z "$MPI" ; then
-@@ -910,7 +910,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g +w1 -DNO_AIO"
+     
+@@ -1546,7 +1546,7 @@
+     if test $DEBUG = "yes"; then
+                 CFLAGS="$CFLAGS -g +w1"
      else 
--        CFLAGS="$CFLAGS -O -DNO_AIO"
-+        CFLAGS="$CFLAGS -DNO_AIO"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     RANLIB=":"
-     if test -z "$MPI"; then
-@@ -998,7 +998,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose -DAIO_PRIORITY_DEFAULT"
+     
+ {
+@@ -1669,7 +1669,7 @@
+     if test $DEBUG = "yes"; then
+                 CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
      else 
--        CFLAGS="$CFLAGS -O -DAIO_PRIORITY_DEFAULT"
-+        CFLAGS="$CFLAGS -DAIO_PRIORITY_DEFAULT"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     MPI_LIB="$MPI_LIB -laio"
-     if test -z "$MPI" ; then
-@@ -1026,7 +1026,7 @@
-     if test $DEBUG = 1; then
-         CFLAGS="$CFLAGS -g -DNO_AIO"
+     
+ {
+@@ -1720,7 +1720,7 @@
+     if test $DEBUG = "yes"; then
+                 CFLAGS="$CFLAGS -g"
      else 
--        CFLAGS="$CFLAGS -O -DNO_AIO"
-+        CFLAGS="$CFLAGS -DNO_AIO"
+-                CFLAGS="$CFLAGS -O"
++                CFLAGS="$CFLAGS"
      fi
-     RANLIB=":"
-     CFLAGS="$CFLAGS -DCRAY -D_UNICOS"
-@@ -1285,7 +1285,7 @@
-     if test $DEBUG = 1; then
+     
+ {
+@@ -2049,7 +2049,7 @@
+     if test $DEBUG = "yes"; then
          CFLAGS="$CFLAGS -g -fullwarn"
      else 
 -        CFLAGS="$CFLAGS -O"
@@ -377,54 +424,3 @@
      fi
     if test $osversion = 4 ; then
  	RANLIB="ar ts"
---- mpich-1.2.1/Makefile.in.orig	Tue Sep  5 22:06:05 2000
-+++ mpich-1.2.1/Makefile.in	Wed May 30 01:07:43 2001
-@@ -327,7 +327,7 @@
- 	CXX="g++" ; export CXX ; \
- 	ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
- 	if ${top_srcdir}/MPI-2-C++/configure --with-mpich=.. \
--			--with-libopt=" " \
-+			--with-libopt="@OPTFLAGS@" \
- 			 --with-profiling \
- 			 --with-mpichbin=${binbuild_dir} \
- 			 --with-mpichlib=${libbuild_dir} \
---- mpich-1.2.1/configure.in.orig	Wed May 30 01:51:15 2001
-+++ mpich-1.2.1/configure.in	Wed May 30 01:56:34 2001
-@@ -3270,6 +3270,7 @@
- 				  --with-f2cmpilibs=-lfmpich \
-                                   --with-flib_path_leader=$LIB_PATH_LEADER \
-                                   --prefix=${prefix} $enable_args \
-+				  --with-cflags="$OPTFLAGSC $OPTFLAGS" \
- 				  $MPE_ARGS )
-     if test $? = 0 ; then
-         echo "Done configuring MPE Profiling Libraries" ; echo
---- mpich-1.2.1/configure.orig	Wed May 30 01:51:15 2001
-+++ mpich-1.2.1/configure	Wed May 30 01:57:11 2001
-@@ -13800,6 +13800,7 @@
- 				  --with-f2cmpilibs=-lfmpich \
-                                   --with-flib_path_leader=$LIB_PATH_LEADER \
-                                   --prefix=${prefix} $enable_args \
-+				  --with-cflags="$OPTFLAGSC $OPTFLAGS" \
- 				  $MPE_ARGS )
-     if test $? = 0 ; then
-         echo "Done configuring MPE Profiling Libraries" ; echo
---- mpich-1.2.1/Makefile.in.orig	Wed May 30 02:39:08 2001
-+++ mpich-1.2.1/Makefile.in	Wed May 30 04:19:59 2001
-@@ -467,6 +467,7 @@
- serv_p4 server:
- 	if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi
- 	( cd mpid/server ; /bin/rm -f config.cache ; \
-+	  CFLAGS="@OPTFLAGSC@ @OPTFLAGS@"; export CFLAGS ; \
- 	  CC="@CC@" ; export CC ; MAKE="${MAKE}" ; export MAKE ; \
- 	  ${top_srcdir}/mpid/server/configure ; $(MAKE) serv_p4 ; \
- 	  cp serv_p4 $(binbuild_dir) )
---- mpich-1.2.1/mpid/ch_p4/setup_ch_p4.orig	Fri Aug 18 21:45:14 2000
-+++ mpich-1.2.1/mpid/ch_p4/setup_ch_p4	Wed May 30 05:11:02 2001
-@@ -253,6 +253,7 @@
- echo "Configuring new p4 secure server"
- (cd mpid/server ; \
-     CC="$CC" ; export CC ; \
-+    CFLAGS="$OPTFLAGS"; export CFLAGS ; \
-     $top_srcdir/mpid/server/configure )
- if test $? != 0 ; then
-     print_error "Configure of the secure server may have failed!"
diff --git a/mpich.spec b/mpich.spec
index e040b6d..248a56f 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,14 +1,14 @@
 Summary:	Portable MPI Model Implementation
 Summary(pl):	Przenośna implementacja standardu MPI
 Name:		mpich
-Version:	1.2.1
-Release:	1
+Version:	1.2.5
+%define	pver	1a
+Release:	%{pver}.1
 License:	Open source (MPICH), BSD-like (MPI-2-C++)
 Group:		Development/Libraries
-Source0:	ftp://ftp.mcs.anl.gov/pub/mpi/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.mcs.anl.gov/pub/mpi/%{name}-%{version}-%{pver}.tar.gz
 Patch0:		%{name}-fuckssh.patch
 Patch1:		%{name}-opt.patch
-Patch2:		%{name}-DESTDIR.patch
 URL:		http://www-unix.mcs.anl.gov/mpi/
 BuildRequires:	gcc-g77
 BuildRequires:	libstdc++-devel
@@ -26,10 +26,9 @@ Interface). Zawiera pełną implementację wersji MPI 1.2 oraz znaczne
 części wersji MPI-2, szczególnie w zakresie równoległej komunikacji.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1	-p1
-%patch2 -p1
 
 %build
 # note: can't run autoconf - we must patch configure not only configure.in
@@ -88,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/guide.ps* COPYRIGHT README announce* KnownBugs *MPI-2-C++
+%doc doc/*.ps* COPYRIGHT README KnownBugs
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*