diff -Naur mpich-from-tar/MPI-2-C++/src/datatype.cc mpich-1.2.0/MPI-2-C++/src/datatype.cc
--- mpich-from-tar/MPI-2-C++/src/datatype.cc	Thu Feb  4 14:22:57 1999
+++ mpich-1.2.0/MPI-2-C++/src/datatype.cc	Mon Jul 24 17:15:14 2000
@@ -61,7 +61,7 @@
 
   PMPI::Datatype data = PMPI::Datatype::Create_struct(count, array_of_blocklengths,
 				       array_of_displacements, pmpi_types);
-  delete pmpi_types;
+  delete[] pmpi_types;
   return data;
 }
 
diff -Naur mpich-from-tar/MPI-2-C++/src/datatype_inln.h mpich-1.2.0/MPI-2-C++/src/datatype_inln.h
--- mpich-from-tar/MPI-2-C++/src/datatype_inln.h	Thu Feb  4 14:22:58 1999
+++ mpich-1.2.0/MPI-2-C++/src/datatype_inln.h	Mon Jul 24 17:15:29 2000
@@ -72,7 +72,7 @@
 
   (void)MPI_Type_struct(count, (int*)array_of_blocklengths,
 			(MPI_Aint*)array_of_displacements, type_array, &newtype);
-  delete type_array;
+  delete[] type_array;
   return newtype;
 }
 
diff -Naur mpich-from-tar/f90modules/Makefile.in mpich-1.2.0/f90modules/Makefile.in
--- mpich-from-tar/f90modules/Makefile.in	Tue Nov  9 22:20:22 1999
+++ mpich-1.2.0/f90modules/Makefile.in	Mon Jul 24 17:13:59 2000
@@ -66,7 +66,7 @@
 	if [ -d .tmp ] ; then rmdir .tmp ; fi
 	if [ ! -d ${includebuild_dir}/f90base ] ; then \
 		mkdir ${includebuild_dir}/f90base ; fi
-	cp mpi-base.${MOD} ${includebuild_dir}/f90base
+	cp mpi-base.${MOD} ${includebuild_dir}/f90base/@MPIMOD@.${MOD}
 	cp @MPICONSTMOD@.${MOD} ${includebuild_dir}/f90base
 	cp @MPIMOD@1.${MOD} ${includebuild_dir}/f90base
 	cp @MPIMOD@2.${MOD} ${includebuild_dir}/f90base
diff -Naur mpich-from-tar/mpid/ch_mpl/configure mpich-1.2.0/mpid/ch_mpl/configure
--- mpich-from-tar/mpid/ch_mpl/configure	Tue Jun  1 20:14:05 1999
+++ mpich-1.2.0/mpid/ch_mpl/configure	Mon Jul 24 17:14:11 2000
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -49,6 +49,7 @@
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -332,7 +333,7 @@
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -490,14 +491,27 @@
   fi
 done
 
+if test "X$enable_cache" = "Xyes" ; then
+  if test -r "$cache_file" ; then
+    echo "loading cache $cache_file"
+    . $cache_file
+  else
+    echo "creating cache $cache_file"
+    > $cache_file
+  fi
+else
+  cache_file="/dev/null"
+fi
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -515,7 +529,7 @@
 # check for mpproto.h
 # (try compile instead?)
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:519: checking how to run the C preprocessor" >&5
+echo "configure:533: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -530,14 +544,14 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 534 "configure"
+#line 548 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@ -547,14 +561,31 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 551 "configure"
+#line 565 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 582 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@ -567,6 +598,8 @@
 rm -f conftest*
 fi
 rm -f conftest*
+fi
+rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
   CPP="$ac_cv_prog_CPP"
@@ -579,18 +612,18 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:583: checking for $ac_hdr" >&5
+echo "configure:616: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 588 "configure"
+#line 621 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -617,29 +650,27 @@
 done
 
 if test $pre_req = 0 ; then
-	print_error "Could not find the header file mpproto.h that is needed"
-	print_error "by the ch_mpl device.  Check that you have"
-	print_error "IBMs parallel operating environment (POE), which is "
-	print_error "required for this device."
-	exit 1
+    { echo "configure: error: Could not find the header file mpproto.h that is needed
+by the ch_mpl device.  Check that you have
+IBMs parallel operating environment (POE), which is 
+required for this device." 1>&2; exit 1; }
 fi
 if test "$MPILIBNAME" = "mpi" ; then 
-	print_error "You should select a name for the MPICH library with"
-	print_error "-mpilibname=name_of_library.  Using mpich as the"
-	print_error "library name."
-	MPILIBNAME="mpich"
+    echo "configure: warning: You should select a name for the MPICH library with
+-mpilibname=name_of_library.  Using mpich as the library name." 1>&2
+    MPILIBNAME="mpich"
 fi
 # We need to check for gettimeofday in case we are not using the Switch
 # timer
 for ac_func in gettimeofday
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:638: checking for $ac_func" >&5
+echo "configure:669: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 643 "configure"
+#line 674 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -662,7 +693,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -688,6 +719,52 @@
 
 
 trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
 
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 
@@ -731,7 +808,7 @@
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -750,9 +827,11 @@
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
diff -Naur mpich-from-tar/mpid/ch_mpl/configure.in mpich-1.2.0/mpid/ch_mpl/configure.in
--- mpich-from-tar/mpid/ch_mpl/configure.in	Tue Jun  1 20:14:07 1999
+++ mpich-1.2.0/mpid/ch_mpl/configure.in	Mon Jul 24 17:14:11 2000
@@ -1,27 +1,18 @@
-dnl
-dnl Caching is usually WRONG for systems with cross-mounted file systems
-dnl (the cache file may correspond to a different system).  Since configure
-dnl is not on a performance-critical path, go for robustness over speed.
-dnl
-define([AC_CACHE_LOAD], )dnl
-define([AC_CACHE_SAVE], )dnl
 AC_INIT()
 AC_CONFIG_HEADER(mpich-mpid.h)
 # check for mpproto.h
 # (try compile instead?)
 AC_CHECK_HEADERS(mpproto.h,pre_req=1,pre_req=0)
 if test $pre_req = 0 ; then
-	print_error "Could not find the header file mpproto.h that is needed"
-	print_error "by the ch_mpl device.  Check that you have"
-	print_error "IBMs parallel operating environment (POE), which is "
-	print_error "required for this device."
-	exit 1
+    AC_MSG_ERROR([Could not find the header file mpproto.h that is needed
+by the ch_mpl device.  Check that you have
+IBMs parallel operating environment (POE), which is 
+required for this device.])
 fi
 if test "$MPILIBNAME" = "mpi" ; then 
-	print_error "You should select a name for the MPICH library with"
-	print_error "-mpilibname=name_of_library.  Using mpich as the"
-	print_error "library name."
-	MPILIBNAME="mpich"
+    AC_MSG_WARN([You should select a name for the MPICH library with
+-mpilibname=name_of_library.  Using mpich as the library name.])
+    MPILIBNAME="mpich"
 fi
 # We need to check for gettimeofday in case we are not using the Switch
 # timer
diff -Naur mpich-from-tar/mpid/ch_p4/localdefs.in mpich-1.2.0/mpid/ch_p4/localdefs.in
--- mpich-from-tar/mpid/ch_p4/localdefs.in	Fri Jun  4 19:42:17 1999
+++ mpich-1.2.0/mpid/ch_p4/localdefs.in	Mon Jul 24 17:13:54 2000
@@ -1,2 +1,2 @@
 #! /bin/sh
-RSHCOMMAND=@RSHCOMMAND@
+RSHCOMMAND="@RSHCOMMAND@"
diff -Naur mpich-from-tar/mpid/ch_p4/setup_ch_p4 mpich-1.2.0/mpid/ch_p4/setup_ch_p4
--- mpich-from-tar/mpid/ch_p4/setup_ch_p4	Fri Nov  5 19:37:48 1999
+++ mpich-1.2.0/mpid/ch_p4/setup_ch_p4	Mon Jul 24 17:13:54 2000
@@ -187,9 +187,9 @@
 . mpid/ch_p4/localdefs
 #
 if test -n "$rshcommand" ; then
-    otherargs="$otherargs -rsh=$rshcommand"
+    otherargs="$otherargs -rsh='"$rshcommand"'"
 elif test -n "$RSHCOMMAND" ; then 
-    otherargs="$otherargs -rsh=$RSHCOMMAND"
+    otherargs="$otherargs -rsh='"$RSHCOMMAND"'"
 fi
 
 # specify the C compiler in case it is different from the P4 choice
@@ -197,13 +197,16 @@
     mkdir mpid/ch_p4$P4EXT/p4$P4EXT
 fi
 export VPATH
+# We use the eval to make sure that otherargs is evaluate correct in the
+# case where it contains quoted arguments with blanks 
+# (e.g., rshcommand="ssh -x")
 (cd mpid/ch_p4$P4EXT/p4$P4EXT ; \
-$top_srcdir/mpid/ch_p4$P4EXT/p4$P4EXT/configure -p4arch=$P4_ARCH \
-    -p4make="$MAKE" -opt="$OPTFLAGS" -cc="$CC" -p4comm="$COMM" \
+eval $top_srcdir/mpid/ch_p4$P4EXT/p4$P4EXT/configure -p4arch=$P4_ARCH \
+    -p4make="'$MAKE'" -opt="$OPTFLAGS" -cc="'$CC'" -p4comm="$COMM" \
     -p4device=$DEVICE -srcdir=$top_srcdir/mpid/ch_p4$P4EXT/p4$P4EXT \
     -exec-prefix=$exec_prefix \
     -libbuild_dir=$libbuild_dir \
-    -cflags="$USER_CFLAGS $P4_CFLAGS $CC_SHARED_OPT" $otherargs )
+    -cflags="'$USER_CFLAGS $P4_CFLAGS $CC_SHARED_OPT'" $otherargs )
 if test $? != 0 ; then
     print_error "Configure of the p4$P4EXT sub-system may have failed!"
     exit 1
diff -Naur mpich-from-tar/romio/adio/ad_pvfs/ad_pvfs_open.c mpich-1.2.0/romio/adio/ad_pvfs/ad_pvfs_open.c
--- mpich-from-tar/romio/adio/ad_pvfs/ad_pvfs_open.c	Thu Aug 19 18:00:32 1999
+++ mpich-1.2.0/romio/adio/ad_pvfs/ad_pvfs_open.c	Mon Jul 24 17:14:32 2000
@@ -47,8 +47,6 @@
                          value, &flag);
     if (flag && (atoi(value) >= 0)) pstat.base = atoi(value);
 
-    ADIOI_Free(value);
-
     fd->fd_sys = pvfs_open(fd->filename, amode, perm, &pstat, NULL);
 
     if ((fd->fd_sys != -1) && (fd->access_mode & ADIO_APPEND))
@@ -63,6 +61,8 @@
 	sprintf(value, "%d", pstat.base);
 	MPI_Info_set(fd->info, "start_iodevice", value);
     }
+
+    ADIOI_Free(value);
 
     *error_code = (fd->fd_sys == -1) ? MPI_ERR_UNKNOWN : MPI_SUCCESS;
 }
diff -Naur mpich-from-tar/romio/adio/common/ad_hints.c mpich-1.2.0/romio/adio/common/ad_hints.c
--- mpich-from-tar/romio/adio/common/ad_hints.c	Fri Aug  6 18:32:52 1999
+++ mpich-1.2.0/romio/adio/common/ad_hints.c	Mon Jul 24 17:14:32 2000
@@ -80,7 +80,7 @@
 
     ADIOI_Free(value);
 
-    if ((fd->file_system == ADIO_PIOFS) && (fd->file_system == ADIO_PVFS))
+    if ((fd->file_system == ADIO_PIOFS) || (fd->file_system == ADIO_PVFS))
 	MPI_Info_delete(info, "ind_wr_buffer_size");
     /* no data sieving for writes in PIOFS and PVFS, because it doesn't
        support file locking */
diff -Naur mpich-from-tar/romio/adio/common/ad_read_coll.c mpich-1.2.0/romio/adio/common/ad_read_coll.c
--- mpich-from-tar/romio/adio/common/ad_read_coll.c	Tue Oct 26 22:57:21 1999
+++ mpich-1.2.0/romio/adio/common/ad_read_coll.c	Mon Jul 24 17:14:26 2000
@@ -712,7 +712,7 @@
    at least another 8Mbytes of temp space is unacceptable. */
 
     int i, j, m, size, ntimes, max_ntimes, buftype_is_contig;
-    ADIO_Offset st_loc=0, end_loc=0, off, done, real_off, req_off;
+    ADIO_Offset st_loc=-1, end_loc=-1, off, done, real_off, req_off;
     char *read_buf, *tmp_buf;
     int *curr_offlen_ptr, *count, *send_size, *recv_size;
     int *partial_send, *recd_from_proc, *start_pos, for_next_iter, err=-1;
@@ -755,7 +755,7 @@
 
     ntimes = (int) ((end_loc - st_loc + coll_bufsize)/coll_bufsize);
 
-    if (!st_loc && !end_loc) ntimes = 0; /* this process does no I/O. */
+    if ((st_loc==-1) && (end_loc==-1)) ntimes = 0; /* this process does no I/O. */
 
     MPI_Allreduce(&ntimes, &max_ntimes, 1, MPI_INT, MPI_MAX, fd->comm); 
 
diff -Naur mpich-from-tar/romio/adio/common/ad_write_coll.c mpich-1.2.0/romio/adio/common/ad_write_coll.c
--- mpich-from-tar/romio/adio/common/ad_write_coll.c	Tue Jun  2 18:56:49 1998
+++ mpich-1.2.0/romio/adio/common/ad_write_coll.c	Mon Jul 24 17:14:26 2000
@@ -250,7 +250,7 @@
    at least another 8Mbytes of temp space is unacceptable. */
 
     int hole, i, j, m, size, ntimes, max_ntimes, buftype_is_contig;
-    ADIO_Offset st_loc=0, end_loc=0, off, done, req_off;
+    ADIO_Offset st_loc=-1, end_loc=-1, off, done, req_off;
     char *write_buf;
     int *curr_offlen_ptr, *count, *send_size, req_len, *recv_size;
     int *partial_recv, *sent_to_proc, *start_pos, err=-1, flag;
@@ -291,7 +291,7 @@
 
     ntimes = (int) ((end_loc - st_loc + coll_bufsize)/coll_bufsize);
 
-    if (!st_loc && !end_loc) ntimes = 0; /* this process does no I/O. */
+    if ((st_loc==-1) && (end_loc==-1)) ntimes = 0; /* this process does no I/O. */
 
     MPI_Allreduce(&ntimes, &max_ntimes, 1, MPI_INT, MPI_MAX,
 		  fd->comm); 
diff -Naur mpich-from-tar/src/env/Makefile.in mpich-1.2.0/src/env/Makefile.in
--- mpich-from-tar/src/env/Makefile.in	Fri Nov  5 22:55:50 1999
+++ mpich-1.2.0/src/env/Makefile.in	Mon Jul 24 17:14:05 2000
@@ -13,6 +13,7 @@
 top_srcdir  = @top_srcdir@
 srcdir      = @srcdir@
 libbuild_dir = @libbuild_dir@
+libdir      = @libdir@
 
 DEFS        = @DEFS@ ${MPIPROFILE} -I. -I${srcdir} @mpich_includes@
 CFLAGS      = @CFLAGS@ 
@@ -132,18 +133,13 @@
 # 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 "@PREFIX@" ; then \
-	      ${CC} ${DEFS} ${CFLAGS} @CC_SHARED_OPT_FOR_TV@ -c \
-	  -DMPICH_INFODLL_LOC='"@PREFIX@/build/${ARCH}/${DEVICE}/lib/libtvmpich.so"' \
+	  ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
+	  -DMPICH_INFODLL_LOC='"@libdir@/libtvmpich.so"' \
 		  ${top_srcdir}/src/env/msgqdllloc.c ; \
-	  else \
-	      ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
-	  -DMPICH_INFODLL_LOC='"@MPIR_HOME@/build/${ARCH}/${DEVICE}/lib/libtvmpich.so"' \
-		  ${top_srcdir}/src/env/msgqdllloc.c ; \
-	  fi \
 	else \
 	    ${CC} ${DEFS} ${CFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
 	fi
+
 .c.o:
 	${CC} ${DEFS} ${INCLUDES} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c $<
 # For VPATH builds, some Fortran compilers use the directory of the file 
diff -Naur mpich-from-tar/src/infoexport/Makefile.in mpich-1.2.0/src/infoexport/Makefile.in
--- mpich-from-tar/src/infoexport/Makefile.in	Tue Aug 31 21:08:18 1999
+++ mpich-1.2.0/src/infoexport/Makefile.in	Mon Jul 24 17:14:05 2000
@@ -58,7 +58,6 @@
 #
 ${libbuild_dir}/${LIB}: ${LIB}
 	@-if test -f ${LIB} ; then cp ${LIB} ${libbuild_dir}/${LIB} ; fi
-	 -if test -f ${LIB} ; then cp libtvmpich.so* ${libbuild_dir} ; fi
 
 # Because this is an optional library, we don't stop if there is an error
 # The following works for Solaris and some other systems
@@ -71,7 +70,7 @@
 	${REMOVER} ${LIB}; \
 	( CC="${CC}" ; export CC ; CLINKER="@CLINKER@" ; export CLINKER ; \
 	${top_srcdir}/util/makesharedlib -lib=libtvmpich.a -obj="${OBJS}" \
-		 -kind=@SHAREDKIND_FOR_TV@ -local ; ) fi
+		 -kind=@SHAREDKIND_FOR_TV@ -local -suffix=so ; ) fi
 
 compile: ${OBJS}
 
diff -Naur mpich-from-tar/src/misc2/subarray.c mpich-1.2.0/src/misc2/subarray.c
--- mpich-from-tar/src/misc2/subarray.c	Mon Aug 30 15:47:53 1999
+++ mpich-1.2.0/src/misc2/subarray.c	Mon Jul 24 17:14:15 2000
@@ -1,5 +1,5 @@
 /* 
- *   $Id: subarray.c,v 1.9 1999/08/30 15:47:53 swider Exp $    
+ *   $Id: subarray.c,v 1.10 1999/12/13 17:31:01 swider Exp $    
  *
  *   Copyright (C) 1997 University of Chicago. 
  *   See COPYRIGHT notice in top-level directory.
@@ -54,7 +54,7 @@
     MPI_Aint extent, disps[3], size;
     int i, blklens[3];
     MPI_Datatype tmp1, tmp2, types[3];
-    int mpi_errno;
+    int mpi_errno=0;
     static char myname[] = "MPI_TYPE_CREATE_SUBARRAY";
 
     if (ndims <= 0) {
diff -Naur mpich-from-tar/util/mpif90.in mpich-1.2.0/util/mpif90.in
--- mpich-from-tar/util/mpif90.in	Mon Nov 29 18:35:49 1999
+++ mpich-1.2.0/util/mpif90.in	Mon Jul 24 17:13:59 2000
@@ -224,7 +224,7 @@
         modulelib=@MPILIBNAME@f90
     else
         moduledir="@F90MODINC@@includebuild_dir@/f90base"
-        modulelib=@MPILIBNAME@f90base
+        modulelib=@MPILIBNAME@f90nc
     fi
     compileargs="$compileargs $moduledir"
     linkargs="$linkargs -l$modulelib"
diff -Naur mpich-from-tar/util/mpiinstall.in mpich-1.2.0/util/mpiinstall.in
--- mpich-from-tar/util/mpiinstall.in	Tue Nov 30 03:48:06 1999
+++ mpich-1.2.0/util/mpiinstall.in	Mon Jul 24 17:14:21 2000
@@ -483,6 +483,7 @@
 	-e "s%[@]SHAREDLIB_LOCALDIR[@]%$SHAREDLIB_LOCALDIR%g" \
 	-e "s%[@]SHARED_LIB_SEARCH_PATH_LEADER[@]%@SHARED_LIB_SEARCH_PATH_LEADER@%g" \
 	-e "s%[@]SYNCLOC[@]%@SYNCLOC@%g" \
+	-e "s%[@]MPD_HOME[@]%${prefix}/bin%g" \
 	-e "s%[@]top_srcdir[@]%@top_srcdir@%g" \
 	-e "s%[@]bindir[@]%@bindir@%g" \
 	-e "s%[@]binbuild_dir[@]%@bindir@%g" \
@@ -589,7 +590,42 @@
     #     mpirun.pg.in
     # This needs to be modified to simply move the needed files, not 
     # all of them.
-    if [ -s $top_srcdir/mpid/$DEVICE/mpirun.lst ] ; then
+    if [ "$DEVICE" = "ch_p4mpd" ] ; then
+	FixupFileWithAt $top_srcdir/mpid/mpd/mpd.h.in $top_srcdir/mpid/mpd/mpd.h $MODE
+	FixupFileWithAt $top_srcdir/mpid/mpd/startdaemons.in $top_srcdir/mpid/mpd/startdaemons $XMODE
+	( cd $top_srcdir/mpid/mpd
+	$MAKE
+	if [ -f mpd ] ; then
+	    echo "Copying $top_srcdir/mpid/mpd/mpd $PREFIX/bin/mpd"
+	    cp mpd $PREFIX/bin/mpd
+	fi
+	if [ -f mpdcon ] ; then
+	    echo "Copying $top_srcdir/mpid/mpd/mpdcon $PREFIX/bin/mpdcon"
+	    cp mpdcon $PREFIX/bin/mpdcon
+	fi
+	if [ -f mpdman ] ; then
+	    echo "Copying $top_srcdir/mpid/mpd/mpdman $PREFIX/bin/mpdman"
+	    cp mpdman $PREFIX/bin/mpdman
+	fi
+	if [ -f startdaemons -a mpd.hosts ] ; then
+	    echo "Copying $top_srcdir/mpid/mpd/startdaemons $PREFIX/bin/startdaemons"
+	    cp startdaemons $PREFIX/bin/startdaemons
+	    echo "Copying $top_srcdir/mpid/mpd/mpd.hosts $PREFIX/bin/mpd.hosts"
+	    cp mpd.hosts $PREFIX/bin/mpd.hosts
+        fi )
+	if [ -f $PREFIX/bin/mpdcon ] ; then
+	    echo "Linking mpd files to $PREFIX/bin/mpdcon"
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdtrace
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpddump
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdexit
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdallexit
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdbomb
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdhelp
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdcleanup
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpdmpexec
+	    ln -s $PREFIX/bin/mpdcon $PREFIX/bin/mpirun
+	fi
+    elif [ -s $top_srcdir/mpid/$DEVICE/mpirun.lst ] ; then
          MPIRUNLIST=`cat ${top_srcdir}/mpid/$DEVICE/mpirun.lst`
     elif [ -s $top_srcdir/mpid/$DEVICE/mpirun.$DEVICE.in ] ; then
          MPIRUNLIST=mpid/$DEVICE/mpirun.$DEVICE.in