ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/ac-tools/configure.in
(Generate patch)

Comparing trunk/ac-tools/configure.in (file contents):
Revision 1371 by skuang, Fri Sep 26 18:54:36 2008 UTC vs.
Revision 1372 by gezelter, Tue Oct 20 13:13:16 2009 UTC

# Line 9 | Line 9 | builtin(include, ac-tools/AC_CXX_STD.m4)
9   builtin(include, ac-tools/AC_CXX_HAVE_STL.m4)
10   builtin(include, ac-tools/AC_CXX_NAMESPACES.m4)
11   builtin(include, ac-tools/AC_CXX_STD.m4)
12 < builtin(include, ac-tools/ACX_MPI.m4)
12 > builtin(include, ac-tools/ax_mpi.m4)
13   builtin(include, ac-tools/CGAL.m4)
14  
15   # who am i
# Line 64 | Line 64 | if test x"$CC" != x; then
64       AC_ERROR([Specified C compiler $CC doesn't seem to exist!])])
65  
66     AS_IF([test AS_VAR_GET([ac_cc_path]) != no],[
67 <     AC_MSG_NOTICE([Will attempt to use $CC as C compiler])],[
67 >     AC_MSG_NOTICE([Will attempt to use $CC as C compiler])
68 >     MPICC=$CC
69 >   ],[
70       AC_ERROR([Can't find path to user-specified C compiler $CC])])
71   fi
72  
# Line 75 | Line 77 | if test x"$CXX" != x; then
77       AC_ERROR([Specified C++ compiler $CXX doesn't seem to exist!])])
78  
79     AS_IF([test AS_VAR_GET([ac_cxx_path]) != no],[
80 <     AC_MSG_NOTICE([Will attempt to use $CXX as C++ compiler])],[
80 >     AC_MSG_NOTICE([Will attempt to use $CXX as C++ compiler])
81 >     MPICXX=$CXX
82 >    ],[
83       AC_ERROR([Can't find path to user-specified C++ compiler $CXX])])
84   fi
85  
# Line 86 | Line 90 | if test x"$FC" != x; then
90       AC_ERROR([Specified Fortran compiler $FC doesn't seem to exist!])])
91  
92     AS_IF([test AS_VAR_GET([ac_fc_path]) != no],[
93 <     AC_MSG_NOTICE([Will attempt to use $FC as Fortran compiler])],[
93 >     AC_MSG_NOTICE([Will attempt to use $FC as Fortran compiler])
94 >     MPIFC=$FC
95 >   ],[
96       AC_ERROR([Can't find path to user-specified Fortran compiler $FC])])
97   fi
98  
99  
100   dnl do MPI checks
101 < ACX_MPI([USE_MPI="yes"],
102 <        [USE_MPI="no"
103 <        AC_MSG_WARN([No suitable MPI implementation found. oopse_MPI will not be build.])])
101 > AC_LANG([C++])
102 > AX_MPI([USE_MPI="yes"],
103 >       [USE_MPI="no"
104 >       AC_MSG_WARN([No suitable C++ MPI implementation found. oopse_MPI will not be built.])])
105 > AS_IF([test AS_VAR_GET([USE_MPI]) != no],[
106 > AC_LANG([C])
107 > AX_MPI([USE_MPI="yes"],
108 >       [USE_MPI="no"
109 >       AC_MSG_WARN([No suitable C MPI implementation found. oopse_MPI will not be built.])])
110 > ])
111 > AS_IF([test AS_VAR_GET([USE_MPI]) != no],[
112 > AC_LANG([Fortran])
113 > AX_MPI([USE_MPI="yes"],
114 >       [USE_MPI="no"
115 >       AC_MSG_WARN([No suitable Fortran MPI implementation found. oopse_MPI will not be built.])])
116 > ])
117 > AS_IF([test AS_VAR_GET([USE_MPI]) != no],[
118 >        CXX=$MPICXX
119 >        CC=$MPICC
120 >        FC=$MPIFC
121 > ])
122   AC_SUBST(USE_MPI)
123  
124   # Checks for programs.
125 < AC_PROG_CXX([$CXX $ac_cv_prog_acx_mpi_mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC])
126 < AC_PROG_CC([$CC $ac_cv_prog_acx_mpi_mpicc icc pathcc pgcc cc xlc gcc])
127 < AC_PROG_FC([$FC $ac_cv_prog_acx_mpi_mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
125 > AC_PROG_CXX([$CXX icpc pathCC pgCC c++ xlc++ xlC g++ CC])
126 > AC_PROG_CC([$CC icc pathcc pgcc cc xlc gcc])
127 > AC_PROG_FC([$FC ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
128   AC_PROG_CPP
129   AC_PROG_EGREP
130   AC_PROG_LN_S

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines