Index: mpid/ch_p4/setup_ch_p4
===================================================================
RCS file: /MPIhome/mpich/mpid/ch_p4/setup_ch_p4,v
retrieving revision 1.6
diff -r1.6 setup_ch_p4
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: 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@"

.