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 1191 by chuckv, Thu Dec 6 19:39:00 2007 UTC vs.
Revision 1225 by gezelter, Fri Feb 8 21:33:46 2008 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)
13   builtin(include, ac-tools/CGAL.m4)
14  
15   # who am i
# Line 56 | Line 57 | fi
57          AC_SUBST(USE_SINGLE_PRECISION)
58   fi
59  
60 + if test x"$CC" != x; then
61 +   AC_CHECK_PROGS(ac_cc_set,[$CC],[no])
62 +   AS_IF([test AS_VAR_GET([ac_cc_set]) != no],[
63 +     AC_PATH_PROG(ac_cc_path,[$ac_cc_set],[no])],[
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])],[
68 +     AC_ERROR([Can't find path to user-specified C compiler $CC])])
69 + fi
70 +
71 + if test x"$CXX" != x; then
72 +   AC_CHECK_PROGS(ac_cxx_set,[$CXX],[no])
73 +   AS_IF([test AS_VAR_GET([ac_cxx_set]) != no],[
74 +     AC_PATH_PROG(ac_cxx_path,[$ac_cxx_set],[no])],[
75 +     AC_ERROR([Specified C++ compiler $CXX doesn't seem to exist!])])
76 +
77 +   AS_IF([test AS_VAR_GET([ac_cxx_path]) != no],[
78 +     AC_MSG_NOTICE([Will attempt to use $CXX as C++ compiler])],[
79 +     AC_ERROR([Can't find path to user-specified C++ compiler $CXX])])
80 + fi
81 +
82 + if test x"$FC" != x; then
83 +   AC_CHECK_PROGS(ac_fc_set,[$FC],[no])
84 +   AS_IF([test AS_VAR_GET([ac_fc_set]) != no],[
85 +     AC_PATH_PROG(ac_fc_path,[$ac_fc_set],[no])],[
86 +     AC_ERROR([Specified Fortran compiler $FC doesn't seem to exist!])])
87 +
88 +   AS_IF([test AS_VAR_GET([ac_fc_path]) != no],[
89 +     AC_MSG_NOTICE([Will attempt to use $FC as Fortran compiler])],[
90 +     AC_ERROR([Can't find path to user-specified Fortran compiler $FC])])
91 + fi
92 +
93 +
94 + dnl do MPI checks
95 + ACX_MPI([USE_MPI="yes"],
96 +        [USE_MPI="no"
97 +        AC_MSG_WARN([No suitable MPI implementation found. oopse_MPI will not be build.])])
98 + AC_SUBST(USE_MPI)
99 +
100   # Checks for programs.
101 < AC_PROG_CXX([mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC])
102 < AC_PROG_CC([mpicc icc pathcc pgcc cc xlc gcc])
103 < AC_PROG_FC([mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
101 > AC_PROG_CXX([$CXX $ac_cv_prog_acx_mpi_mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC])
102 > AC_PROG_CC([$CC $ac_cv_prog_acx_mpi_mpicc icc pathcc pgcc cc xlc gcc])
103 > 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)
104   AC_PROG_CPP
105   AC_PROG_EGREP
106   AC_PROG_LN_S
107   AC_PROG_MAKE_SET
108   AC_PROG_RANLIB
109 + AC_PROG_YACC
110 + AC_PROG_LEX
111   AX_SYS_PERLSHARPBANG
112   AC_PROG_INSTALL
113   case "x$INSTALL" in
# Line 146 | Line 189 | ACX_CHECK_FFTW
189   AC_CHECK_LIB(m, asin, , exit)
190   ACX_CHECK_ZLIB
191   ACX_CHECK_FFTW
192 + ACX_CHECK_QHULL
193 + ACX_CHECK_OPENBABEL
194  
150
195   # Checks for header files.
196   AC_HEADER_STDC
197   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])
# Line 234 | Line 278 | AC_DEFINE([OBAPI], [], [Used to export symbols for DLL
278   dnl OpenBabel needs this:
279   AC_DEFINE([OBAPI], [], [Used to export symbols for DLL / shared library builds])
280  
237
238 AC_ARG_WITH(mpi,
239        [AC_HELP_STRING([--with-mpi=<prefix>],
240                [compile with MPI installed in <prefix> [default=no]])],
241        with_mpi=$withval,
242        with_mpi="no")
243
244 case "x$with_mpi" in
245        xyes | "x")  USE_MPI=yes;;
246        xno) USE_MPI=no ;;
247        *) MPI="$with_mpi"; USE_MPI=yes ;;
248 esac
249 if test "$USE_MPI" = "yes" -a -z "$with_mpi"; then
250        MPI="/usr/local"
251 fi
252 if test "$USE_MPI" = "yes"; then
253        ACX_MPI
254 fi
255 AC_SUBST(USE_MPI)
256
281   dnl check for CGAL library
282   ACX_CGAL
283 <
283 > USE_CGAL=no
284   if test "$acx_cgal_found" == yes; then
285 < USE_CGAL=yes
286 < AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
287 < AC_SUBST(USE_CGAL)
288 < AC_SUBST(CGAL_CXXFLAGS)
289 < AC_SUBST(CGAL_LDFLAGS)
290 < AC_SUBST(CGAL_CPPFLAGS)
267 < AC_SUBST(CGAL_LIBS)
285 >        USE_CGAL=yes
286 >        AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
287 >        AC_SUBST(CGAL_CXXFLAGS)
288 >        AC_SUBST(CGAL_LDFLAGS)
289 >        AC_SUBST(CGAL_CPPFLAGS)
290 >        AC_SUBST(CGAL_LIBS)
291   fi
292 + AC_SUBST(USE_CGAL)
293  
294  
295   BB_ENABLE_DOXYGEN
# Line 284 | Line 308 | AC_SUBST(F90_MODULE_NAMES)
308   AC_SUBST(LDFLAGS)
309   AC_SUBST(PREPDEFFLAG)
310   AC_SUBST(F90_MODULE_NAMES)
311 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/math/Makefile src/applications/staticProps/Makefile scripts/filepp], [chmod 0755 scripts/*])
311 > AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/math/Makefile src/applications/atom2md/Makefile scripts/filepp], [chmod 0755 scripts/*])
312  
313   AC_OUTPUT

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines