--- trunk/OOPSE-3.0/configure	2006/05/17 19:54:27	2758
+++ trunk/OOPSE-3.0/configure	2006/05/25 15:27:20	2772
@@ -13027,6 +13027,16 @@ have_mpif_h=0
 
 echo "$as_me:$LINENO: checking whether mpif.h is usable" >&5
 echo $ECHO_N "checking whether mpif.h is usable... $ECHO_C" >&6
+
+
+ac_ext=${FC_SRCEXT-f}
+ac_compile='$FC -c $FCFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext >&5'
+ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_fc_compiler_gnu
+
+ac_save_ext=$ac_ext
+ac_ext=F90
+ac_save_FCFLAGS=$FCFLAGS
 have_mpif_h=0
 rm -f conftest*
 cat >conftest.$ac_ext <<EOF
@@ -13056,7 +13066,15 @@ fi
 _ACEOF
 
 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'
@@ -13064,7 +13082,7 @@ LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_save_LDFLAGS=$LDFLAGS
-LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
+LDFLAGS="-L${MPI_LIB_DIR} ${LDFLAGS} "
 
 if test x = x"$MPI_LIB"; then
         echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
@@ -13144,14 +13162,15 @@ if test x = x"$MPI_LIB"; then
 fi
 
 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 -lmpi" >&5
-echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
-if test "${ac_cv_lib_mpi_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="-lmpi  $LIBS"
+LIBS="-lpmpich -lmpich -lpmpich -lmpich $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13204,25 +13223,24 @@ 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_mpi_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_mpi_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_mpi_MPI_Init" >&5
-echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
-if test $ac_cv_lib_mpi_MPI_Init = yes; then
-  MPI_LIB="-lmpi"
+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
-$as_unset ac_cv_lib_mpi_MPI_Init
 if test x = x"$MPI_LIB"; then
         echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
 echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
@@ -13230,7 +13248,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  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13297,19 +13315,19 @@ if test $ac_cv_lib_mpi_MPI_Init = yes; then
 echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
 echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
 if test $ac_cv_lib_mpi_MPI_Init = yes; then
-  MPI_LIB="-lmpi -llam"
+  MPI_LIB="-lmpi"
 fi
 
 fi
-$as_unset ac_cv_lib_mpich_MPI_Init
+$as_unset ac_cv_lib_mpi_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 -lmpi" >&5
+echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6
+if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpich "-lpmpich" $LIBS"
+LIBS="-lmpi -llam $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13362,25 +13380,24 @@ 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_mpi_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_mpi_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_mpi_MPI_Init" >&5
+echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6
+if test $ac_cv_lib_mpi_MPI_Init = yes; then
+  MPI_LIB="-lmpi -llam"
 fi
 
 fi
-
 $as_unset ac_cv_lib_mpi_MPI_Init
 if test x = x"$MPI_LIB"; then
 echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5