[svn-r5913] Purpose:

    Bug Fix
Description:
    We were getting the wrong MPIRUN program when you used the full
    pathname. The "case" statement was checking the "F9X" macro, but it
    really only needed the basename of the F9X macro.
Solution:
    Put wildcard matching in so that it would find the appropriate
    basename.
Platforms tested:
    Modi4

2 files changed, 4 insertions, 4 deletions

diff --git a/fortran/configure b/fortran/configure
index af19f95..bb32a65 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -8081,7 +8081,7 @@ cross_compiling=$ac_cv_prog_f9x_cross
 
 
 case "$F9X" in
-  mpif90)
+  *mpif90*)
             PARALLEL=mpif90
     echo "$as_me:$LINENO: checking for mpirun" >&5
 echo $ECHO_N "checking for mpirun... $ECHO_C" >&6
@@ -8111,7 +8111,7 @@ echo "${ECHO_T}none" >&6
     fi
     ;;
 
-  mpxlf | mpxlf_r | mpxlf90 | mpxlf90_r | mpxlf95 | mpxlf95_r)
+  *mpxlf* | *mpxlf_r* | *mpxlf90* | *mpxlf90_r* | *mpxlf95* | *mpxlf95_r*)
         PARALLEL="$F9X"
     ;;
 
diff --git a/fortran/configure.in b/fortran/configure.in
index 4009e4b..e894841 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -457,7 +457,7 @@ dnl executable. For `mpif90' the executable should be run with `mpirun'
 dnl from the same directory as mpif90 if it exists.
 dnl
 case "$F9X" in
-  mpif90)
+  *mpif90*)
     dnl The mpich compiler. Use mpirun from the same directory if it
     dnl exists.
     PARALLEL=mpif90
@@ -488,7 +488,7 @@ case "$F9X" in
     fi
     ;;
 
-  mpxlf | mpxlf_r | mpxlf90 | mpxlf90_r | mpxlf95 | mpxlf95_r)
+  *mpxlf* | *mpxlf_r* | *mpxlf90* | *mpxlf90_r* | *mpxlf95* | *mpxlf95_r*)
     dnl The IBM compiler
     PARALLEL="$F9X"
     ;;