Index: f90modules/Makefile.in
===================================================================
RCS file: /MPIhome/mpich/f90modules/Makefile.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -r1.24 -r1.25
69c69
< 	cp mpi-base.${MOD} ${includebuild_dir}/f90base
---
> 	cp mpi-base.${MOD} ${includebuild_dir}/f90base/@MPIMOD@.${MOD}
Index: mpid/ch_mpl/configure
===================================================================
RCS file: /MPIhome/mpich/mpid/ch_mpl/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -r1.2 -r1.3
4c4
< # Generated automatically using autoconf version 2.12 
---
> # Generated automatically using autoconf version 2.13 
51a52
> SHELL=${CONFIG_SHELL-/bin/sh}
335c336
<     echo "configure generated by autoconf version 2.12"
---
>     echo "configure generated by autoconf version 2.13"
492a494,504
> 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
498c510
< 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'
500a513,514
> ac_exeext=
> ac_objext=o
518c532
< echo "configure:519: checking how to run the C preprocessor" >&5
---
> echo "configure:533: checking how to run the C preprocessor" >&5
533c547
< #line 534 "configure"
---
> #line 548 "configure"
539,540c553,554
< { (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}\$"`
550c564,581
< #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"
556,557c587,588
< { (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}\$"`
569a601,602
> fi
> rm -f conftest*
582c615
< echo "configure:583: checking for $ac_hdr" >&5
---
> echo "configure:616: checking for $ac_hdr" >&5
587c620
< #line 588 "configure"
---
> #line 621 "configure"
592,593c625,626
< { (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}\$"`
620,624c653,656
< 	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; }
627,630c659,661
< 	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"
637c668
< echo "configure:638: checking for $ac_func" >&5
---
> echo "configure:669: checking for $ac_func" >&5
642c673
< #line 643 "configure"
---
> #line 674 "configure"
665c696
< 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
690a722,767
> 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
734c811
<     echo "$CONFIG_STATUS generated by autoconf version 2.12"
---
>     echo "$CONFIG_STATUS generated by autoconf version 2.13"
752a830
> s%@SHELL@%$SHELL%g
755a834
> s%@FFLAGS@%$FFLAGS%g
Index: mpid/ch_mpl/configure.in
===================================================================
RCS file: /MPIhome/mpich/mpid/ch_mpl/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -r1.2 -r1.3
1,7d0
< 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
14,18c7,10
< 	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.])
21,24c13,15
< 	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"
Index: mpid/ch_p4/localdefs.in
===================================================================
RCS file: /MPIhome/mpich/mpid/ch_p4/localdefs.in,v
retrieving revision 1.1
diff -r1.1 localdefs.in
2c2
< RSHCOMMAND=@RSHCOMMAND@
---
> RSHCOMMAND="@RSHCOMMAND@"
Index: mpid/ch_p4/setup_ch_p4
===================================================================
RCS file: /MPIhome/mpich/mpid/ch_p4/setup_ch_p4,v
retrieving revision 1.6
retrieving revision 1.9
diff -r1.6 -r1.9
190c190
<     otherargs="$otherargs -rsh=$rshcommand"
---
>     otherargs="$otherargs -rsh='"$rshcommand"'"
192c192
<     otherargs="$otherargs -rsh=$RSHCOMMAND"
---
>     otherargs="$otherargs -rsh='"$RSHCOMMAND"'"
199a200,202
> # 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")
201,202c204,205
< $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" \
206c209
<     -cflags="$USER_CFLAGS $P4_CFLAGS $CC_SHARED_OPT" $otherargs )
---
>     -cflags="'$USER_CFLAGS $P4_CFLAGS $CC_SHARED_OPT'" $otherargs )
Index: src/misc2/subarray.c
===================================================================
RCS file: /MPIhome/mpich/src/misc2/subarray.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -r1.9 -r1.10
2c2
<  *   $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 $    
57c57
<     int mpi_errno;
---
>     int mpi_errno=0;
Index: util/mpif90.in
===================================================================
RCS file: /MPIhome/mpich/util/mpif90.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -r1.27 -r1.28
227c227
<         modulelib=@MPILIBNAME@f90base
---
>         modulelib=@MPILIBNAME@f90nc
Index: util/mpiinstall.in
===================================================================
RCS file: /MPIhome/mpich/util/mpiinstall.in,v
retrieving revision 1.72
diff -r1.72 mpiinstall.in
485a486
> 	-e "s%[@]MPD_HOME[@]%${prefix}/bin%g" \
592c593,628
<     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