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

Comparing trunk/ac-tools/configure.in (file contents):
Revision 1395 by gezelter, Fri Dec 4 17:38:47 2009 UTC vs.
Revision 1396 by gezelter, Sat Dec 5 02:57:05 2009 UTC

# Line 54 | Line 54 | if test "$ok" = "yes"; then
54          AC_DEFINE(SINGLE_PRECISION,1,[Define to compile in single precision.])
55          USE_SINGLE_PRECISION=yes
56          AC_SUBST(USE_SINGLE_PRECISION)
57 fi
58
59 if test x"$CC" != x; then
60   AC_CHECK_PROGS(ac_cc_set,[$CC],[no])
61   AS_IF([test AS_VAR_GET([ac_cc_set]) != no],[
62     AC_PATH_PROG(ac_cc_path,[$ac_cc_set],[no])],[
63     AC_ERROR([Specified C compiler $CC doesn't seem to exist!])])
64
65   AS_IF([test AS_VAR_GET([ac_cc_path]) != no],[
66     AC_MSG_NOTICE([Will attempt to use $CC as C compiler])
67     MPICC=$CC
68   ],[
69     AC_ERROR([Can't find path to user-specified C compiler $CC])])
70 fi
71
72 if test x"$CXX" != x; then
73   AC_CHECK_PROGS(ac_cxx_set,[$CXX],[no])
74   AS_IF([test AS_VAR_GET([ac_cxx_set]) != no],[
75     AC_PATH_PROG(ac_cxx_path,[$ac_cxx_set],[no])],[
76     AC_ERROR([Specified C++ compiler $CXX doesn't seem to exist!])])
77
78   AS_IF([test AS_VAR_GET([ac_cxx_path]) != no],[
79     AC_MSG_NOTICE([Will attempt to use $CXX as C++ compiler])
80     MPICXX=$CXX
81    ],[
82     AC_ERROR([Can't find path to user-specified C++ compiler $CXX])])
83 fi
84
85 if test x"$FC" != x; then
86   AC_CHECK_PROGS(ac_fc_set,[$FC],[no])
87   AS_IF([test AS_VAR_GET([ac_fc_set]) != no],[
88     AC_PATH_PROG(ac_fc_path,[$ac_fc_set],[no])],[
89     AC_ERROR([Specified Fortran compiler $FC doesn't seem to exist!])])
90
91   AS_IF([test AS_VAR_GET([ac_fc_path]) != no],[
92     AC_MSG_NOTICE([Will attempt to use $FC as Fortran compiler])
93     MPIFC=$FC
94   ],[
95     AC_ERROR([Can't find path to user-specified Fortran compiler $FC])])
57   fi
58  
59 + AC_PROG_CXX([$CXX icpc pathCC pgCC c++ xlc++ xlC g++ CC])
60 + AC_PROG_CC([$CC icc pathcc pgcc cc xlc gcc])
61 + AC_PROG_FC([$FC ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
62  
63 < dnl do MPI checks
64 < save_LIBS_CHECK_CXX_LIB="$LIBS"
63 > save_CXX=$CXX
64 > save_CC=$CC
65 > save_FC=$FC
66 > save_LIBS=$LIBS
67  
68   AC_LANG([C++])
69   AX_MPI([USE_MPI="yes"],
# Line 119 | Line 85 | AS_IF([test AS_VAR_GET([USE_MPI]) != no],[
85          CXX=$MPICXX
86          CC=$MPICC
87          FC=$MPIFC
88 < ])
88 >        LIBS="$MPILIBS $LIBS"
89 > ],[
90 >        CXX=$save_CXX
91 >        CC=$save_CC
92 >        FC=$save_FC
93 >        LIBS=$save_LIBS
94 > ]
95 > )
96   AC_SUBST(USE_MPI)
97  
98   # Checks for programs.
126 AC_PROG_CXX([$CXX icpc pathCC pgCC c++ xlc++ xlC g++ CC])
127 AC_PROG_CC([$CC icc pathcc pgcc cc xlc gcc])
128 AC_PROG_FC([$FC ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
99   AC_PROG_CPP
100   AC_PROG_EGREP
101   AC_PROG_LN_S

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines