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 958 by gezelter, Wed May 17 03:03:03 2006 UTC vs.
Revision 973 by gezelter, Thu May 25 14:54:41 2006 UTC

# Line 816 | Line 816 | AC_MSG_CHECKING([whether mpif.h is usable])
816   fi
817  
818   AC_MSG_CHECKING([whether mpif.h is usable])
819 + AC_LANG_SAVE()
820 + AC_LANG(Fortran)
821 + ac_save_ext=$ac_ext
822 + ac_ext=F90
823 + ac_save_FCFLAGS=$FCFLAGS
824   have_mpif_h=0
825   rm -f conftest*
826   cat >conftest.$ac_ext <<EOF
# Line 839 | Line 844 | fi
844   if test "$have_mpif_h" = 1; then
845      AC_DEFINE(HAVE_MPIF_H, 1, [have mpif.h])
846   fi
847 + FCFLAGS=$ac_save_FCFLAGS
848 + ac_ext=$ac_save_ext
849 + AC_LANG_RESTORE()
850  
851   AC_LANG_PUSH(C)
852   ac_save_LDFLAGS=$LDFLAGS
853 < LDFLAGS="${LDFLAGS} -L${MPI_LIB_DIR} "
853 > LDFLAGS="-L${MPI_LIB_DIR} ${LDFLAGS} "
854  
855   if test x = x"$MPI_LIB"; then
856          AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lmpich"])
857   fi
858 + $as_unset ac_cv_lib_mpich_MPI_Init
859   if test x = x"$MPI_LIB"; then
860 +        AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lpmpich -lmpich"], [],
861 +                     "-lpmpich")
862 + fi
863 + if test x = x"$MPI_LIB"; then
864          AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi"])
865   fi
866   $as_unset ac_cv_lib_mpi_MPI_Init
867   if test x = x"$MPI_LIB"; then
868          AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam"], [],
869                       "-llam")
857 fi
858 $as_unset ac_cv_lib_mpich_MPI_Init
859 if test x = x"$MPI_LIB"; then
860        AC_CHECK_LIB(mpich, MPI_Init, [MPI_LIB="-lpmpich -lmpich"], [],
861                     "-lpmpich")
870   fi
863
871   $as_unset ac_cv_lib_mpi_MPI_Init
872   if test x = x"$MPI_LIB"; then
873   AC_CHECK_LIB(mpi, MPI_Init, [MPI_LIB="-lmpi -llam -lpthread"],[

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines