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 1225 by gezelter, Fri Feb 8 21:33:46 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
131   AC_PROG_MAKE_SET
132   AC_PROG_RANLIB
109 AC_PROG_YACC
110 AC_PROG_LEX
133   AX_SYS_PERLSHARPBANG
134   AC_PROG_INSTALL
135   case "x$INSTALL" in
# Line 194 | Line 216 | AC_HEADER_STDC
216  
217   # Checks for header files.
218   AC_HEADER_STDC
219 < AC_CHECK_HEADERS([conio.h dlfcn.h fstream.h iostream.h libintl.h limits.h machine/hal_sysinfo.h math.h stddef.h stdio.h stdlib.h string.h strings.h strstream.h sys/param.h sys/pstat.h sys/sysmp.h sys/sysctl.h sys/sysinfo.h sys/systemcfg.h sys/table.h sys/time.h time.h unistd.h zlib.h])
219 > AC_CHECK_HEADERS([libintl.h limits.h machine/hal_sysinfo.h stdlib.h string.h strings.h sys/param.h sys/pstat.h sys/sysctl.h sys/sysinfo.h sys/sysmp.h sys/systemcfg.h sys/table.h sys/time.h unistd.h])
220  
221   # Checks for typedefs, structures, and compiler characteristics.
222   AC_HEADER_STDBOOL
223   AC_C_CONST
224   AC_C_INLINE
203 AC_C_RESTRICT
225   AC_TYPE_SIZE_T
226   AC_HEADER_TIME
206 AC_CHECK_TYPES(clock_t)
207 AC_C_CONST
208 AC_C_INLINE
227  
228   # Checks for library functions.
229   AC_FUNC_MALLOC
212 AC_FUNC_MEMCMP
230   AC_FUNC_REALLOC
231   AC_FUNC_SELECT_ARGTYPES
215 AC_FUNC_STRFTIME
232   AC_FUNC_STRTOD
233 < AC_CHECK_FUNCS([floor getpagesize gettimeofday memchr memmove memset pow pstat_getdynamic pstat_getstatic rint select snprintf sranddev sqrt strcasecmp strchr strdup stricmp strncasecmp strnicmp strrchr strstr strtol sysmp getsysinfo sysctl table])
233 > AC_CHECK_FUNCS([floor getpagesize gettimeofday memset pow pstat_getdynamic pstat_getstatic select sqrt strcasecmp strchr strdup stricmp strncasecmp strnicmp strstr strtol sysmp getsysinfo sysctl table])
234  
235   # special check for _system_configuration because AIX <4.3.2 do not
236   # contain the `physmem' member.
# Line 226 | Line 242 | AC_TRY_COMPILE([#include <sys/systemcfg.h>],
242              [Define if you have the _system_configuration variable.])],
243    [AC_MSG_RESULT([no])])
244  
229 dnl check for system getopt
230 adl_FUNC_GETOPT_LONG
231
232 AC_LANG_CPLUSPLUS
233 AC_CXX_NAMESPACES
234 AC_CXX_STD
235 AC_CHECK_HEADERS([ctype.h iostream fstream sstream strstream])
236 # AC_CPP_FUNC
237 # ------------------ #
238 # Checks to see if ANSI C99 CPP variable __func__ works.
239 # If not, perhaps __FUNCTION__ works instead.
240 # If not, we'll just define __func__ to "".
241 AC_DEFUN([AC_CPP_FUNC],
242 [AC_REQUIRE([AC_PROG_CC_STDC])dnl
243 AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
244 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
245 [[const char *foo = __func__;]])],
246  [ac_cv_cpp_func=yes],
247  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
248 [[const char *foo = __FUNCTION__;]])],
249  [ac_cv_cpp_func=__FUNCTION__],
250  [ac_cv_cpp_func=no])])])
251 if test $ac_cv_cpp_func = __FUNCTION__; then
252  AC_DEFINE(__func__,__FUNCTION__,
253            [Define to __FUNCTION__ or "" if `__func__' does not conform to
254 ANSI C.])
255 elif test $ac_cv_cpp_func = no; then
256  AC_DEFINE(__func__,"",
257            [Define to __FUNCTION__ or "" if `__func__' does not conform to
258 ANSI C.])
259 fi
260 ])# AC_CPP_FUNC
261
262 AC_CPP_FUNC
263 AC_SUBST(__func__)
264
265
245   dnl check for strong optimization options
246  
247   case $debug in
# Line 275 | Line 254 | esac
254       ;;
255   esac
256  
278 dnl OpenBabel needs this:
279 AC_DEFINE([OBAPI], [], [Used to export symbols for DLL / shared library builds])
280
257   dnl check for CGAL library
258   ACX_CGAL
259   USE_CGAL=no
# Line 308 | Line 284 | AC_SUBST(F90_MODULE_NAMES)
284   AC_SUBST(LDFLAGS)
285   AC_SUBST(PREPDEFFLAG)
286   AC_SUBST(F90_MODULE_NAMES)
287 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/math/Makefile src/applications/atom2md/Makefile scripts/filepp], [chmod 0755 scripts/*])
287 > AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/math/Makefile src/integrators/Makefile src/applications/atom2md/Makefile scripts/filepp], [chmod 0755 scripts/*])
288  
289   AC_OUTPUT

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines