--- trunk/OOPSE-4/configure	2006/05/25 14:54:41	2769
+++ trunk/OOPSE-4/configure	2006/07/07 19:44:54	2926
@@ -1655,7 +1655,7 @@ if test -n "$ac_tool_prefix"; then
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC icpc icc pgCC pathCC c++ xlc++ xlC g++ CC
+  for ac_prog in $CCC mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -1697,7 +1697,7 @@ if test -z "$CXX"; then
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in $CCC icpc icc pgCC pathCC c++ xlc++ xlC g++ CC
+  for ac_prog in $CCC mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2211,7 +2211,7 @@ if test -n "$ac_tool_prefix"; then
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in icc pgcc pathcc cc xlc gcc
+  for ac_prog in mpicc icc pathcc pgcc cc xlc gcc
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2253,7 +2253,7 @@ if test -z "$CC"; then
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in icc pgcc pathcc cc xlc gcc
+  for ac_prog in mpicc icc pathcc pgcc cc xlc gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2722,7 +2722,7 @@ if test -n "$ac_tool_prefix"; then
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
+  for ac_prog in mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2764,7 +2764,7 @@ if test -z "$FC"; then
 fi
 if test -z "$FC"; then
   ac_ct_FC=$FC
-  for ac_prog in ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
+  for ac_prog in mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -12999,12 +12999,18 @@ echo "$as_me:$LINENO: checking for mpi.h" >&5
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 echo "$as_me:$LINENO: checking for mpi.h" >&5
 echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
 have_mpi_h=0
 rm -f conftest*
-echo '#include <mpi.h>' > conftest.cc
-if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then
+echo '#include <mpi.h>' > conftest.c
+if ${CC} -I${MPI_INC_DIR} -c conftest.c 2>&1 ; then
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
         have_mpi_h=1
@@ -13068,11 +13074,11 @@ ac_ext=cc
 fi
 FCFLAGS=$ac_save_FCFLAGS
 ac_ext=$ac_save_ext
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_ext=c
@@ -13164,13 +13170,13 @@ if test x = x"$MPI_LIB"; then
 fi
 $as_unset ac_cv_lib_mpich_MPI_Init
 if test x = x"$MPI_LIB"; then
-        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
-echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
-if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
+        echo "$as_me:$LINENO: checking for MPI_Init in -lpmpich" >&5
+echo $ECHO_N "checking for MPI_Init in -lpmpich... $ECHO_C" >&6
+if test "${ac_cv_lib_pmpich_MPI_Init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpich "-lpmpich" $LIBS"
+LIBS="-lpmpich -lmpich -lpmpich -lmpich $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13223,21 +13229,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_mpich_MPI_Init=yes
+  ac_cv_lib_pmpich_MPI_Init=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_mpich_MPI_Init=no
+ac_cv_lib_pmpich_MPI_Init=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
-echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
-if test $ac_cv_lib_mpich_MPI_Init = yes; then
-  MPI_LIB="-lpmpich -lmpich"
+echo "$as_me:$LINENO: result: $ac_cv_lib_pmpich_MPI_Init" >&5
+echo "${ECHO_T}$ac_cv_lib_pmpich_MPI_Init" >&6
+if test $ac_cv_lib_pmpich_MPI_Init = yes; then
+  MPI_LIB="-lpmpich -lmpich -lpmpich -lmpich"
 fi
 
 fi
@@ -13327,7 +13333,7 @@ LIBS="-lmpi "-llam" $LIBS"
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpi "-llam" $LIBS"
+LIBS="-lmpi -llam $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF