ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/ac-tools/OOPSE.m4
(Generate patch)

Comparing trunk/ac-tools/OOPSE.m4 (file contents):
Revision 973 by gezelter, Thu May 25 14:54:41 2006 UTC vs.
Revision 988 by gezelter, Thu Jun 15 18:38:58 2006 UTC

# Line 796 | Line 796 | AC_SUBST([MPI_INC_DIR])
796   AC_SUBST([MPI_LIB_DIR])
797   AC_SUBST([MPI_INC_DIR])
798  
799 + AC_LANG(C)
800   AC_MSG_CHECKING([for mpi.h])
801   have_mpi_h=0
802   rm -f conftest*
803 < echo '#include <mpi.h>' > conftest.cc
804 < if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then
803 > echo '#include <mpi.h>' > conftest.c
804 > if ${CC} -I${MPI_INC_DIR} -c conftest.c 2>&1 ; then
805          AC_MSG_RESULT(yes)
806          have_mpi_h=1
807   else
# Line 857 | Line 858 | if test x = x"$MPI_LIB"; then
858   fi
859   $as_unset ac_cv_lib_mpich_MPI_Init
860   if test x = x"$MPI_LIB"; then
861 <        AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lpmpich -lmpich"], [],
862 <                     "-lpmpich")
861 >        AC_CHECK_LIB(pmpich, MPI_Init, [MPI_LIB="-lpmpich -lmpich -lpmpich -lmpich"], [],
862 >                     [-lmpich -lpmpich -lmpich])
863   fi
864   if test x = x"$MPI_LIB"; then
865          AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
# Line 866 | Line 867 | if test x = x"$MPI_LIB"; then
867   $as_unset ac_cv_lib_mpi_MPI_Init
868   if test x = x"$MPI_LIB"; then
869          AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
870 <                     "-llam")
870 >                     [-llam])
871   fi
872   $as_unset ac_cv_lib_mpi_MPI_Init
873   if test x = x"$MPI_LIB"; then

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines