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 502 by gezelter, Thu Apr 14 21:41:56 2005 UTC vs.
Revision 1225 by gezelter, Fri Feb 8 21:33:46 2008 UTC

# Line 1 | Line 1 | dnl **** Process this file with autoconf to produce a
1   dnl **** Process this file with autoconf to produce a configure script.
2 <
3 < AC_INIT(OOPSE, 2.0, gezelter@nd.edu, oopse)
2 > AC_PREREQ(2.59)
3 > AC_INIT(OOPSE, 4.0, gezelter@nd.edu, oopse)
4   AC_CONFIG_AUX_DIR(ac-tools)
5 + AC_CONFIG_SRCDIR([src/applications/oopse/oopse.cpp])
6 + AC_CONFIG_HEADER([src/config.h])
7  
8 < builtin(include, ac-tools/fortran90.m4)
9 < builtin(include, ac-tools/aclocal.m4)
8 > builtin(include, ac-tools/OOPSE.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 < AC_CONFIG_SRCDIR([src/applications/oopse/oopse.cpp])
15 > # who am i
16 > AC_CANONICAL_HOST
17  
18   AC_PREFIX_DEFAULT("/usr/local")
19  
# Line 14 | Line 21 | AC_SUBST(PROGNAME)
21   PROGNAME="oopse"
22   AC_SUBST(PROGNAME)
23  
24 + AC_EXEEXT
25 + AC_OBJEXT
26 + OBJEXT=".$OBJEXT"
27 +
28 + OOPSE=oopse
29 +
30 + dnl **** define home dir of oopse
31 + if test "x${prefix}" = "xNONE"
32 + then
33 +  OOPSE_HOME=${ac_default_prefix}/oopse
34 + else
35 +  OOPSE_HOME=${prefix}/oopse
36 + fi
37 + AC_ARG_ENABLE(oopse-home,
38 + [  --enable-oopse-home=DIR      define oopse home dir [PREFIX/oopse]],
39 + [OOPSE_HOME="${enableval}"])
40 +
41   # there are two ways to do debugging.  One with the --enable-debug flag
42   # and one using the DEBUG environment variable
43  
# Line 25 | Line 49 | AC_SUBST(debug)
49   fi
50   AC_SUBST(debug)
51  
52 < # who am i
53 < AC_CANONICAL_HOST
52 > AC_ARG_ENABLE(single, [AC_HELP_STRING([--enable-single],[compile OOPSE in single precision])], ok=$enableval, ok=no)
53 > AC_ARG_ENABLE(float, [AC_HELP_STRING([--enable-float],[synonym for --enable-single])], ok=$enableval)
54 > if test "$ok" = "yes"; then
55 >        AC_DEFINE(SINGLE_PRECISION,1,[Define to compile in single precision.])
56 >        USE_SINGLE_PRECISION=yes
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 < dnl Checks for C compiler
72 < AC_PROG_CC([icc xlc gcc cc])
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 < dnl Checks for C++ compiler
78 < AC_PROG_CXX([icpc icc xlc++ xlC CC g++ c++])
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 < dnl If we are not running g++ then we might need some other flags
83 < dnl to get the templates compiled correctly
84 < OOPSE_TEMPLATE_FLAGS=""
85 < if test $ac_cv_prog_gxx = no; then
86 <  AC_MSG_CHECKING([checking whether ${CXX} accepts -ptused -no_prelink])
44 <  echo 'void f(){}' > conftest.cc
45 <  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
46 <    AC_MSG_RESULT(yes)
47 <    OOPSE_TEMPLATE_FLAGS="-ptused -no_prelink"
48 <  else
49 <    AC_MSG_RESULT(no)
50 <  fi
51 <  rm -f conftest*
52 <  AC_MSG_CHECKING([checking whether ${CXX} accepts -instances=static])
53 <  echo 'void f(){}' > conftest.cc
54 <  if test -z "`${CXX} -instances=static -c conftest.cc 2>&1`"; then
55 <    AC_MSG_RESULT(yes)
56 <    OOPSE_TEMPLATE_FLAGS="-instances=static"
57 <  else
58 <    AC_MSG_RESULT(no)
59 <  fi
60 <  rm -f conftest*
61 <  AC_MSG_CHECKING([checking whether ${CXX} accepts -pto])
62 <  echo 'void f(){}' > conftest.cc
63 <  if test -z "`${CXX} -pto -c conftest.cc 2>&1`"; then
64 <    AC_MSG_RESULT(yes)
65 <    OOPSE_TEMPLATE_FLAGS="-pto"
66 <  else
67 <    AC_MSG_RESULT(no)
68 <  fi
69 <  rm -f conftest*
70 <  AC_MSG_CHECKING([checking whether ${CXX} accepts -LANG:std])
71 <  echo 'void f(){}' > conftest.cc
72 <  if test -z "`${CXX} -LANG:std -c conftest.cc 2>&1`"; then
73 <    AC_MSG_RESULT(yes)
74 <    
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 <    EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
89 <  else
90 <    AC_MSG_RESULT(no)
79 <  fi
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
81 – AC_SUBST(OOPSE_TEMPLATE_FLAGS)
82 – AC_SUBST(EXTRA_CC_FLAG)
92  
84 – dnl Fortran 90 compilation checks are next
93  
94 < AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
95 < dnl Check the flag for Fortran90 preprocessing
96 < ACX_PROG_F90_PREPFLAG
97 < dnl Check to see if a flag is required for preprocessing defines
98 < ACX_PROG_F90_PREPDEFFLAG
91 < AC_LANG_PUSH(Fortran 90)
92 < AC_LANG_PREPROC(Fortran 90)
93 < AC_F90_LIBRARY_LDFLAGS
94 < dnl How does Fortran mangle function names
95 < AC_F90_WRAPPERS
96 < AC_SUBST(F90_FUNC)
97 < AC_SUBST(F90_FUNC_)
98 < dnl Fortran 90 module suffix
99 < AC_CHECK_MODSUFFIX
100 < dnl Fortran 90 module path specifier
101 < AC_CHECK_MODDIRFLAG
102 < AC_F90_MODULE_NAMES
103 < pat=`echo $ac_cv_f90_module_names | sed 's/.*\(%.*%\).*/\1/'`
104 < F90_MODULE_NAMES=empty
105 < case $pat in
106 <       %MODULE%)
107 <          F90_MODULE_NAMES=UPPER ;;
108 <       %Module%)
109 <          F90_MODULE_NAMES=Mixed ;;
110 <       %module%)
111 <          F90_MODULE_NAMES=lower ;;
112 <       *)
113 <          F90_MODULE_NAMES=unknown ;;
114 < esac
115 < AC_SUBST(F90_MODULE_NAMES)
116 < AC_LANG_POP
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 < AC_LANG_PUSH(C)
101 < AC_CHECK_HEADERS(unistd.h sys/pstat.h sys/sysmp.h sys/sysinfo.h sys/table.h sys/param.h sys/sysctl.h sys/sytemcfg.h machine/hal_sysinfo.h)
102 < AC_CHECK_FUNCS(pstat_getstatic sysmp getsysinfo sysctl table)
103 < # special check for _system_configuration because AIX <4.3.2 do not
104 < # contain the `physmem' member.
105 < AC_MSG_CHECKING([for external symbol _system_configuration])
124 < AC_TRY_COMPILE([#include <sys/systemcfg.h>],
125 <               [double x = _system_configuration.physmem;],
126 <  [AC_MSG_RESULT([yes])
127 <  AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
128 <            [Define if you have the _system_configuration variable.])],
129 <  [AC_MSG_RESULT([no])])
130 <
131 < dnl check for system getopt
132 < adl_FUNC_GETOPT_LONG
133 <
134 < dnl check for strong optimization options
135 <
136 < case $debug in
137 <  1)
138 <     ;;
139 <  *)
140 <   ACX_PROG_CC_MAXOPT
141 <   ACX_PROG_CXX_MAXOPT
142 <   ACX_PROG_F90_MAXOPT
143 <     ;;
144 < esac
145 <
146 < AC_PROG_INSTALL
100 > # Checks for programs.
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
114 +   x/*) ;;
115 +   *) INSTALL=`pwd`/ac-tools/"shtool install -c" ;
116 + esac
117 + MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
118   AC_CHECK_PROG(AR, ar, ar, NONE)
119   if test "$AR" = "NONE"; then
155 –  AC_MSG_ERROR(--> Can't find \`ar'!)
120    AC_CACHE_SAVE
121    exit 1
122   fi
159 –
123   AC_PATH_PROG(PS, ps)
124   AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
125          if $PS ax -o rss > /dev/null 2>&1; then
# Line 179 | Line 142 | AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_pro
142                  fi
143          fi
144   ])
182 –
145   AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
184 –
146   if test "$ac_cv_prog_ps_syntax" = BSD; then
147 <  AC_DEFINE(PSTYPE_IS_BSD, 1)
147 >  AC_DEFINE(PSTYPE_IS_BSD, 1, [ps uses BSD-style arguments])
148   else
149     if test "$ac_cv_prog_ps_syntax" = POSIX; then
150 <       AC_DEFINE(PSTYPE_IS_POSIX, 1)
150 >       AC_DEFINE(PSTYPE_IS_POSIX, 1, [ps uses POSIX-style arguments])
151     else
152         AC_MSG_ERROR(Unknown ps syntax type!)
153     fi
154   fi
155  
156 < AC_ARG_WITH(mpi,
157 <        [AC_HELP_STRING([--with-mpi=<prefix>],
158 <                [compile with MPI installed in <prefix> [default=no]])],
159 <        with_mpi=$withval,
160 <        with_mpi="no")
156 > AC_LANG_PUSH(Fortran)
157 > AC_FC_SRCEXT(F90)
158 > dnl Check the flag for Fortran90 preprocessing
159 > ACX_PROG_F90_PREPFLAG
160 > dnl Check to see if a flag is required for preprocessing defines
161 > ACX_PROG_F90_PREPDEFFLAG
162 > AC_FC_WRAPPERS
163 > AC_SUBST(FC_FUNC)
164 > AC_SUBST(FC_FUNC_)
165 > AC_FC_LIBRARY_LDFLAGS
166 > dnl Fortran 90 module suffix
167 > AC_CHECK_MODSUFFIX
168 > dnl Fortran 90 module path specifier
169 > AC_CHECK_MODDIRFLAG
170 > AC_F90_MODULE_NAMES
171 > pat=`echo $ac_cv_f90_module_names | sed 's/.*\(%.*%\).*/\1/'`
172 > F90_MODULE_NAMES=empty
173 > case $pat in
174 >       %MODULE%)
175 >          F90_MODULE_NAMES=UPPER ;;
176 >       %Module%)
177 >          F90_MODULE_NAMES=Mixed ;;
178 >       %module%)
179 >          F90_MODULE_NAMES=lower ;;
180 >       *)
181 >          F90_MODULE_NAMES=unknown ;;
182 > esac
183 > AC_SUBST(F90_MODULE_NAMES)
184 > AC_LANG_POP
185  
186 < case "x$with_mpi" in
202 <        xyes | "x")  USE_MPI=yes;;
203 <        xno) USE_MPI=no ;;
204 <        *) MPI="$with_mpi"; USE_MPI=yes ;;
205 < esac
206 < if test "$USE_MPI" = "yes" -a -z "$with_mpi"; then
207 <        MPI="/usr/local"
208 < fi
209 < if test "$USE_MPI" = "yes"; then
210 <        ACX_MPI
211 < fi
212 < AC_SUBST(USE_MPI)
186 > AC_LANG_C
187  
188 < dnl AC_ARG_WITH(sprng,
189 < dnl     [AC_HELP_STRING([--with-sprng=<prefix>],
190 < dnl             [compile with SPRNG installed in <prefix> [default=/usr/local]])],
191 < dnl     with_sprng=$withval,
192 < dnl     with_sprng="/usr/local")
193 < dnl
220 < dnl case "x$with_sprng" in
221 < dnl        xyes | "x")  USE_SPRNG=yes;;
222 < dnl        xno) USE_SPRNG=no ;;
223 < dnl        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
224 < dnl esac
225 < dnl if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
226 < dnl        SPRNG="/usr/local"
227 < dnl fi
228 < dnl if test "$USE_SPRNG" = "yes"; then
229 < dnl         ACX_SPRNG
230 < dnl fi
231 < dnl AC_SUBST(USE_SPRNG)
188 > dnl Checks for libraries.
189 > AC_CHECK_LIB(m, asin, , exit)
190 > ACX_CHECK_ZLIB
191 > ACX_CHECK_FFTW
192 > ACX_CHECK_QHULL
193 > ACX_CHECK_OPENBABEL
194  
195 < dnl ########################################
196 < dnl # Check for CGAL headers and libraries #
197 < dnl ########################################
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])
198  
199 < USE_CGAL=no
200 < cgal_makefile=auto
201 < AC_ARG_WITH(cgal-makefile,[  --with-cgal-makefile=FILE  CGAL makefile that should be used],       cgal_makefile="$withval")
199 > # Checks for typedefs, structures, and compiler characteristics.
200 > AC_HEADER_STDBOOL
201 > AC_C_CONST
202 > AC_C_INLINE
203 > AC_C_RESTRICT
204 > AC_TYPE_SIZE_T
205 > AC_HEADER_TIME
206 > AC_CHECK_TYPES(clock_t)
207 > AC_C_CONST
208 > AC_C_INLINE
209  
210 < if test "x$cgal_makefile" != xno; then
210 > # Checks for library functions.
211 > AC_FUNC_MALLOC
212 > AC_FUNC_MEMCMP
213 > AC_FUNC_REALLOC
214 > AC_FUNC_SELECT_ARGTYPES
215 > AC_FUNC_STRFTIME
216 > AC_FUNC_STRTOD
217 > 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])
218  
219 <  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
220 <    cgal_makefile="$CGAL_MAKEFILE"
221 <  fi
219 > # special check for _system_configuration because AIX <4.3.2 do not
220 > # contain the `physmem' member.
221 > AC_MSG_CHECKING([for external symbol _system_configuration])
222 > AC_TRY_COMPILE([#include <sys/systemcfg.h>],
223 >               [double x = _system_configuration.physmem;],
224 >  [AC_MSG_RESULT([yes])
225 >  AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
226 >            [Define if you have the _system_configuration variable.])],
227 >  [AC_MSG_RESULT([no])])
228  
229 <  echo "cgal_makefile      $cgal_makefile"
229 > dnl check for system getopt
230 > adl_FUNC_GETOPT_LONG
231  
232 <  if test -f "$cgal_makefile"; then
233 <
234 <    cat >config.tmp.Makefile <<EOF
235 < include $cgal_makefile
236 < default:
237 <        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
238 <        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
239 <        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
240 <        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
241 <        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
242 <        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
243 <        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
244 <        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
245 <        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
246 <        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
247 <        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
248 <        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
249 < EOF
250 <
251 <    make -s -f config.tmp.Makefile
252 <    . config.tmp.cgalvariables
253 <
254 <    rm -f config.tmp.Makefile config.tmp.cgalvariables
255 <
256 <    if test "x$CGAL_INCLDIR" = "x"; then
257 <      CGAL_INCLDIR=""
258 <    fi
276 <
277 <    if test "x$CGAL_LIBDIR" = "x"; then
278 <      CGAL_LIBDIR=""
279 <    fi
280 <
281 <    if test "x$CGAL_RLIBDIR" = "x"; then
282 <      CGAL_RLIBDIR=""
283 <    fi
284 <
285 <    if test "x$LEDA_INCLDIR" = "x"; then
286 <      LEDA_INCLDIR=""
287 <    fi
288 <
289 <    if test "x$LEDA_LIBDIR" = "x"; then
290 <      LEDA_LIBDIR=""
291 <    fi
292 <
293 <    if test "x$LEDA_RLIBDIR" = "x"; then
294 <      LEDA_RLIBDIR=""
295 <    fi
296 <
297 <    if test "x$GMP_INCLDIR" = "x"; then
298 <      GMP_INCLDIR=""
299 <    fi
300 <
301 <    if test "x$GMP_LIBDIR" = "x"; then
302 <      GMP_LIBDIR=""
303 <    fi
304 <
305 <    if test "x$GMP_RLIBDIR" = "x"; then
306 <      GMP_RLIBDIR=""
307 <    fi
308 <
309 <    echo "CGAL_OS_COMPILER   $CGAL_OS_COMPILER"
310 <    echo "CGAL_INCLDIR       $CGAL_INCLDIR"
311 <    echo "CGAL_INCLCONFDIR   $CGAL_INCLCONFDIR"
312 <    echo "CGAL_LIBDIR        $CGAL_LIBDIR"
313 <    echo "CGAL_CXXFLAGS      $CGAL_CXXFLAGS"
314 <    echo "LEDA_INCLDIR       $LEDA_INCLDIR"
315 <    echo "LEDA_LIBDIR        $LEDA_LIBDIR"
316 <    echo "GMP_INCLDIR        $GMP_INCLDIR"
317 <    echo "GMP_LIBDIR         $GMP_LIBDIR"
318 <
319 <    AC_LANG_PUSH(C++)
320 <    save_CXXFLAGS="$CXXFLAGS"
321 <    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
322 <    AC_CHECK_HEADER(CGAL/Cartesian.h, cgal=yes, cgal=no)
323 <    CXXFLAGS="$save_CXXFLAGS"
324 <
325 <    if test "x$cgal" = xyes; then
326 <      AC_MSG_CHECKING([for CGAL version])
327 <      LOCATION=${CGAL_INCLDIR}
328 <      LOCATION=${LOCATION:-/usr/include}
329 <      if test -f $LOCATION/CGAL/version.h; then
330 <        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
331 <      else
332 <        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
333 <      fi
334 < changequote({, })dnl
335 <      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
336 < changequote([, ])dnl
337 <        AC_MSG_RESULT([($CGAL_VERSION) yes])
338 <      else
339 <        AC_MSG_RESULT([($CGAL_VERSION) no])
340 <        cgal=no
341 <      fi
342 <    fi
343 <
344 <    if test "x$cgal" = xyes; then
345 <      CGAL_LIBS="-lCGAL"
346 <      AC_MSG_CHECKING([whether CGAL uses LEDA])
347 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
348 <        CGAL_USES_LEDA=yes
349 <        AC_MSG_RESULT([yes])
350 <        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
351 <      else
352 <        AC_MSG_RESULT([no])
353 <        CGAL_USES_LEDA=no
354 <      fi
355 <
356 <      AC_MSG_CHECKING([whether CGAL uses GMP])
357 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
358 <        CGAL_USES_GMP=yes
359 <        AC_MSG_RESULT([yes])
360 <        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
361 <      else
362 <        AC_MSG_RESULT([no])
363 <        CGAL_USES_GMP=no
364 <      fi
365 <
366 <      CGAL_LIBS="$CGAL_LIBS -lm"
367 <
368 <      CGAL_CXXFLAGS="-ftemplate-depth-50"
369 <
370 <      echo "CGAL_USES_LEDA     $CGAL_USES_LEDA"
371 <      echo "CGAL_USES_GMP      $CGAL_USES_GMP"
372 <      echo "CGAL_INCLDIR       $CGAL_INCLDIR"
373 <      echo "CGAL_LIBDIR        $CGAL_LIBDIR"
374 <      echo "CGAL_DEFINES       $CGAL_DEFINES"
375 <      echo "CGAL_CXXFLAGS      $CGAL_CXXFLAGS"
376 <      echo "CGAL_LIBS          $CGAL_LIBS"
377 <    fi
378 <
379 <    if test "x$cgal" = xyes; then
380 <      save_LIBS="$LIBS"
381 <      LIBS="$LIBS -L$CGAL_LIBDIR"
382 <      if test "x$CGAL_USES_LEDA" = xyes; then
383 <        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
384 <      fi
385 <      # if test "x$CGAL_USES_GMP" = xyes; then
386 <      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
387 <      # fi
388 <      AC_CHECK_CXX_LIB(CGAL, ::CGAL::Cartesian<int>::Point_2, [#include <CGAL/Cartesian.h>], [::CGAL::Cartesian<int>::Point_2 P], [cgal=yes], [cgal=no], -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR)
389 <      LIBS="$save_LIBS"
390 <    fi
391 <
392 <  fi
393 <  AC_LANG_POP()
394 <
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 < if test "x$cgal" = xyes; then
263 <  USE_CGAL=yes
399 <  AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
400 <  AC_DEFINE_UNQUOTED(CGAL_VERSION, $CGAL_VERSION, [The CGAL version number.])
401 < changequote({, })dnl
402 <  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
403 < changequote([, ])dnl
404 <    AC_MSG_WARN(*****************************************************)
405 <    AC_MSG_WARN(*** Warning: Your CGAL version is newer than the  ***)
406 <    AC_MSG_WARN(*** supported versions. It may still work though. ***)
407 <    AC_MSG_WARN(*****************************************************)
408 <  fi
409 < else
410 <   if test "x$cgal_makefile" != xno; then
411 <    AC_MSG_WARN(*********************************************************)
412 <    AC_MSG_WARN(*** Warning: CGAL was not found.                      ***)
413 <    AC_MSG_WARN(*** Run \"configure\" with the appropriate options.     ***)
414 <    AC_MSG_WARN(*** CGAL support will be disabled.                    ***)
415 <    AC_MSG_WARN(*********************************************************)
416 <  fi
417 <  CGAL_INCLDIR=
418 <  CGAL_LIBDIR=
419 <  CGAL_RLIBDIR=
420 <  CGAL_DEFINES=
421 <  CGAL_CXXFLAGS=
422 <  CGAL_LIBS=
423 < fi
262 > AC_CPP_FUNC
263 > AC_SUBST(__func__)
264  
425 – AC_SUBST(USE_CGAL)
426 – CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
427 – AC_SUBST(CGAL_INC_DIR)
428 – CGAL_LIB_DIR=${CGAL_LIBDIR}
429 – AC_SUBST(CGAL_LIB_DIR)
430 – CGAL_RLIB_DIR=${CGAL_RLIBDIR}
431 – AC_SUBST(CGAL_RLIB_DIR)
432 – AC_SUBST(CGAL_DEFINES)
433 – AC_SUBST(CGAL_CXXFLAGS)
434 – AC_SUBST(CGAL_LIBS)
265  
266 < dnl CHECK_MKL
266 > dnl check for strong optimization options
267  
438 – BB_ENABLE_DOXYGEN
439 –
440 – AC_EXEEXT
441 – AC_OBJEXT
442 – OBJEXT=".$OBJEXT"
443 –
444 – OOPSE=oopse
445 –
446 – dnl **** define home dir of oopse
447 – if test "x${prefix}" = "xNONE"
448 – then
449 –  OOPSE_HOME=${ac_default_prefix}/oopse
450 – else
451 –  OOPSE_HOME=${prefix}/oopse
452 – fi
453 – AC_ARG_ENABLE(oopse-home,
454 – [  --enable-oopse-home=DIR      define oopse home dir [PREFIX/oopse]],
455 – [OOPSE_HOME="${enableval}"])
456 –
457 – case "x$INSTALL" in
458 –   x/*) ;;
459 –   *) INSTALL=`pwd`/ac-tools/"shtool install -c" ;
460 – esac
461 –
462 – MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
463 –
464 – dnl **** Define CFLAGS etc empty to prevent configure from setting them
465 – CFLAGS=${CFLAGS-""}
466 – CXXFLAGS=${CXXFLAGS-""}
467 – CPPFLAGS=${CPPFLAGS-""}
468 – FFLAGS=${FFLAGS-""}
469 – F90FLAGS=${F90FLAGS-""}
470 – LDFLAGS=${LDFLAGS-""}
471 – DEBUG=${DEBUG-"-g"}
472 –
268   case $debug in
269    1)
475 –     FFLAGS="$DEBUG $FFLAGS"
476 –     F90FLAGS="$DEBUG $F90FLAGS"
270       ;;
271    *)
272 +   ACX_PROG_FC_MAXOPT
273 +   ACX_PROG_CC_MAXOPT
274 +   ACX_PROG_CXX_MAXOPT
275       ;;
276   esac
277  
278 + dnl OpenBabel needs this:
279 + AC_DEFINE([OBAPI], [], [Used to export symbols for DLL / shared library builds])
280  
281 + dnl check for CGAL library
282 + ACX_CGAL
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(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
296 +
297   AC_SUBST(EXEEXT)
298   AC_SUBST(OBJEXT)
299   AC_SUBST(BATEXT)
# Line 490 | Line 304 | AC_SUBST(CPPFLAGS)
304   AC_SUBST(CFLAGS)
305   AC_SUBST(CXXFLAGS)
306   AC_SUBST(CPPFLAGS)
307 < AC_SUBST(FFLAGS)
494 < AC_SUBST(F90FLAGS)
307 > AC_SUBST(FCFLAGS)
308   AC_SUBST(LDFLAGS)
496 – AC_SUBST(PREPFLAG)
309   AC_SUBST(PREPDEFFLAG)
310   AC_SUBST(F90_MODULE_NAMES)
311 < AC_CONFIG_HEADER([src/config.h])
500 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/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