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 811 by gezelter, Thu Dec 15 14:47:17 2005 UTC vs.
Revision 1298 by skuang, Fri Sep 26 18:54:36 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)
7 < 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 17 | 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 28 | 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([pathcc 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([pathCC 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 Checks for C preprocessor
83 < AC_PROG_CPP
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 < dnl Checks for grep and egrep
89 < AC_PROG_EGREP
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  
48 – dnl If we are not running g++ then we might need some other flags
49 – dnl to get the templates compiled correctly
50 – OOPSE_TEMPLATE_FLAGS=""
51 – if test $ac_cv_prog_gxx = no; then
52 –  AC_MSG_CHECKING([checking whether ${CXX} accepts -ptused -no_prelink])
53 –  echo 'void f(){}' > conftest.cc
54 –  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
55 –    AC_MSG_RESULT(yes)
56 –    OOPSE_TEMPLATE_FLAGS="-ptused -no_prelink"
57 –  else
58 –    AC_MSG_RESULT(no)
59 –  fi
60 –  rm -f conftest*
61 –  AC_MSG_CHECKING([checking whether ${CXX} accepts -instances=static])
62 –  echo 'void f(){}' > conftest.cc
63 –  if test -z "`${CXX} -instances=static -c conftest.cc 2>&1`"; then
64 –    AC_MSG_RESULT(yes)
65 –    OOPSE_TEMPLATE_FLAGS="-instances=static"
66 –  else
67 –    AC_MSG_RESULT(no)
68 –  fi
69 –  rm -f conftest*
70 –  AC_MSG_CHECKING([checking whether ${CXX} accepts -pto])
71 –  echo 'void f(){}' > conftest.cc
72 –  if test -z "`${CXX} -pto -c conftest.cc 2>&1`"; then
73 –    AC_MSG_RESULT(yes)
74 –    OOPSE_TEMPLATE_FLAGS="-pto"
75 –  else
76 –    AC_MSG_RESULT(no)
77 –  fi
78 –  rm -f conftest*
79 –  AC_MSG_CHECKING([checking whether ${CXX} accepts -LANG:std])
80 –  echo 'void f(){}' > conftest.cc
81 –  if test -z "`${CXX} -LANG:std -c conftest.cc 2>&1`"; then
82 –    AC_MSG_RESULT(yes)
83 –    
93  
94 <    EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
95 <  else
96 <    AC_MSG_RESULT(no)
97 <  fi
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([$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 > AX_SYS_PERLSHARPBANG
110 > AC_PROG_INSTALL
111 > case "x$INSTALL" in
112 >   x/*) ;;
113 >   *) INSTALL=`pwd`/ac-tools/"shtool install -c" ;
114 > esac
115 > MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
116 > AC_CHECK_PROG(AR, ar, ar, NONE)
117 > if test "$AR" = "NONE"; then
118 >  AC_CACHE_SAVE
119 >  exit 1
120   fi
121 < AC_SUBST(OOPSE_TEMPLATE_FLAGS)
122 < AC_SUBST(EXTRA_CC_FLAG)
121 > AC_PATH_PROG(PS, ps)
122 > AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
123 >        if $PS ax -o rss > /dev/null 2>&1; then
124 >                ac_cv_prog_ps_ax=yes
125 >        else
126 >                ac_cv_prog_ps_ax=no
127 >        fi
128 >        if $PS -ef -o rss > /dev/null 2>&1; then
129 >                ac_cv_prog_ps_ef=yes
130 >        else
131 >                ac_cv_prog_ps_ef=no
132 >        fi
133 >        if test "$ac_cv_prog_ps_ax" = yes; then
134 >                ac_cv_prog_ps_syntax=BSD
135 >        else
136 >                if test "$ac_cv_prog_ps_ef" = yes; then
137 >                        ac_cv_prog_ps_syntax=POSIX
138 >                else
139 >                        AC_MSG_ERROR(Could not determine ps syntax)
140 >                fi
141 >        fi
142 > ])
143 > AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
144 > if test "$ac_cv_prog_ps_syntax" = BSD; then
145 >  AC_DEFINE(PSTYPE_IS_BSD, 1, [ps uses BSD-style arguments])
146 > else
147 >   if test "$ac_cv_prog_ps_syntax" = POSIX; then
148 >       AC_DEFINE(PSTYPE_IS_POSIX, 1, [ps uses POSIX-style arguments])
149 >   else
150 >       AC_MSG_ERROR(Unknown ps syntax type!)
151 >   fi
152 > fi
153  
154 < dnl Fortran 90 compilation checks are next
155 <
95 < AC_PROG_F90([pathf95 ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
154 > AC_LANG_PUSH(Fortran)
155 > AC_FC_SRCEXT(F90)
156   dnl Check the flag for Fortran90 preprocessing
157   ACX_PROG_F90_PREPFLAG
158   dnl Check to see if a flag is required for preprocessing defines
159   ACX_PROG_F90_PREPDEFFLAG
160 < AC_LANG_PUSH(Fortran 90)
161 < AC_LANG_PREPROC(Fortran 90)
162 < AC_F90_LIBRARY_LDFLAGS
163 < dnl How does Fortran mangle function names
104 < AC_F90_WRAPPERS
105 < AC_SUBST(F90_FUNC)
106 < AC_SUBST(F90_FUNC_)
160 > AC_FC_WRAPPERS
161 > AC_SUBST(FC_FUNC)
162 > AC_SUBST(FC_FUNC_)
163 > AC_FC_LIBRARY_LDFLAGS
164   dnl Fortran 90 module suffix
165   AC_CHECK_MODSUFFIX
166   dnl Fortran 90 module path specifier
# Line 124 | Line 181 | AC_LANG_POP
181   AC_SUBST(F90_MODULE_NAMES)
182   AC_LANG_POP
183  
184 < AC_LANG_CPLUSPLUS
128 < AC_HEADER_STDC
129 < AC_CXX_NAMESPACES
130 < AC_CXX_STD
184 > AC_LANG_C
185  
186   dnl Checks for libraries.
187   AC_CHECK_LIB(m, asin, , exit)
134 –
135 – AC_LANG_C
188   ACX_CHECK_ZLIB
189 < dnl Checks for header files.
190 < AC_CHECK_HEADERS([stdlib.h string.h sys/param.h unistd.h sys/time.h stdio.h conio.h strstream.h iostream.h fstream.h math.h time.h sys/pstat.h sys/sysmp.h sys/sysinfo.h sys/table.h sys/sysctl.h sys/sytemcfg.h machine/hal_sysinfo.h])
191 < AC_LANG_CPLUSPLUS
192 < AC_CHECK_HEADERS([ctype.h iostream fstream sstream strstream])
193 < AC_LANG_C
194 < AC_CHECK_FUNCS([rint snprintf sranddev strcasecmp strncasecmp stricmp strnicmp pstat_getstatic sysmp getsysinfo sysctl table])
189 > ACX_CHECK_FFTW
190 > ACX_CHECK_QHULL
191 > ACX_CHECK_OPENBABEL
192 >
193 > # Checks for header files.
194 > AC_HEADER_STDC
195 > 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])
196 >
197 > # Checks for typedefs, structures, and compiler characteristics.
198 > AC_HEADER_STDBOOL
199 > AC_C_CONST
200 > AC_C_INLINE
201 > AC_TYPE_SIZE_T
202 > AC_HEADER_TIME
203 >
204 > # Checks for library functions.
205 > AC_FUNC_MALLOC
206 > AC_FUNC_REALLOC
207 > AC_FUNC_SELECT_ARGTYPES
208 > AC_FUNC_STRTOD
209 > 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])
210 >
211   # special check for _system_configuration because AIX <4.3.2 do not
212   # contain the `physmem' member.
213   AC_MSG_CHECKING([for external symbol _system_configuration])
# Line 149 | Line 217 | AC_TRY_COMPILE([#include <sys/systemcfg.h>],
217    AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
218              [Define if you have the _system_configuration variable.])],
219    [AC_MSG_RESULT([no])])
152 – AC_HEADER_TIME
220  
154 – dnl Checks for typedefs, structures, and compiler characteristics.
155 – AC_CHECK_TYPES(clock_t)
156 – AC_C_CONST
157 – AC_C_INLINE
158 –
159 –
160 – dnl check for system getopt
161 – adl_FUNC_GETOPT_LONG
162 –
221   dnl check for strong optimization options
222  
223   case $debug in
224    1)
225       ;;
226    *)
227 +   ACX_PROG_FC_MAXOPT
228     ACX_PROG_CC_MAXOPT
229     ACX_PROG_CXX_MAXOPT
171 –   ACX_PROG_F90_MAXOPT
230       ;;
231   esac
174 –
175 – AC_PROG_INSTALL
176 – AC_PROG_LN_S
177 – AC_PROG_MAKE_SET
178 – AC_PROG_RANLIB
179 – AC_PROG_YACC
180 – AC_PROG_LEX
181 – AX_SYS_PERLSHARPBANG
182 – AC_CHECK_PROG(AR, ar, ar, NONE)
183 – if test "$AR" = "NONE"; then
184 –  AC_MSG_ERROR(--> Can't find \`ar'!)
185 –  AC_CACHE_SAVE
186 –  exit 1
187 – fi
188 –
189 – AC_PATH_PROG(PS, ps)
190 – AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
191 –        if $PS ax -o rss > /dev/null 2>&1; then
192 –                ac_cv_prog_ps_ax=yes
193 –        else
194 –                ac_cv_prog_ps_ax=no
195 –        fi
196 –        if $PS -ef -o rss > /dev/null 2>&1; then
197 –                ac_cv_prog_ps_ef=yes
198 –        else
199 –                ac_cv_prog_ps_ef=no
200 –        fi
201 –        if test "$ac_cv_prog_ps_ax" = yes; then
202 –                ac_cv_prog_ps_syntax=BSD
203 –        else
204 –                if test "$ac_cv_prog_ps_ef" = yes; then
205 –                        ac_cv_prog_ps_syntax=POSIX
206 –                else
207 –                        AC_MSG_ERROR(Could not determine ps syntax)
208 –                fi
209 –        fi
210 – ])
211 –
212 – AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
213 – AC_DEFINE([OBAPI], [], [Used to export symbols for DLL / shared library builds])
214 –
215 –
216 – if test "$ac_cv_prog_ps_syntax" = BSD; then
217 –  AC_DEFINE(PSTYPE_IS_BSD, 1, [ps uses BSD-style arguments])
218 – else
219 –   if test "$ac_cv_prog_ps_syntax" = POSIX; then
220 –       AC_DEFINE(PSTYPE_IS_POSIX, 1, [ps uses POSIX-style arguments])
221 –   else
222 –       AC_MSG_ERROR(Unknown ps syntax type!)
223 –   fi
224 – fi
225 –
226 – AC_ARG_WITH(mpi,
227 –        [AC_HELP_STRING([--with-mpi=<prefix>],
228 –                [compile with MPI installed in <prefix> [default=no]])],
229 –        with_mpi=$withval,
230 –        with_mpi="no")
232  
233 < case "x$with_mpi" in
234 <        xyes | "x")  USE_MPI=yes;;
234 <        xno) USE_MPI=no ;;
235 <        *) MPI="$with_mpi"; USE_MPI=yes ;;
236 < esac
237 < if test "$USE_MPI" = "yes" -a -z "$with_mpi"; then
238 <        MPI="/usr/local"
239 < fi
240 < if test "$USE_MPI" = "yes"; then
241 <        ACX_MPI
242 < fi
243 < AC_SUBST(USE_MPI)
244 <
245 < dnl AC_ARG_WITH(sprng,
246 < dnl     [AC_HELP_STRING([--with-sprng=<prefix>],
247 < dnl             [compile with SPRNG installed in <prefix> [default=/usr/local]])],
248 < dnl     with_sprng=$withval,
249 < dnl     with_sprng="/usr/local")
250 < dnl
251 < dnl case "x$with_sprng" in
252 < dnl        xyes | "x")  USE_SPRNG=yes;;
253 < dnl        xno) USE_SPRNG=no ;;
254 < dnl        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
255 < dnl esac
256 < dnl if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
257 < dnl        SPRNG="/usr/local"
258 < dnl fi
259 < dnl if test "$USE_SPRNG" = "yes"; then
260 < dnl         ACX_SPRNG
261 < dnl fi
262 < dnl AC_SUBST(USE_SPRNG)
263 <
264 < dnl ########################################
265 < dnl # Check for CGAL headers and libraries #
266 < dnl ########################################
267 <
233 > dnl check for CGAL library
234 > ACX_CGAL
235   USE_CGAL=no
236 < cgal_makefile=auto
237 < AC_ARG_WITH(cgal-makefile,[  --with-cgal-makefile=FILE  CGAL makefile that should be used],       cgal_makefile="$withval")
238 <
239 < if test "x$cgal_makefile" != xno; then
240 <
241 <  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
242 <    cgal_makefile="$CGAL_MAKEFILE"
276 <  fi
277 <
278 <  AC_MSG_CHECKING(for cgal_makefile: $cgal_makefile)
279 <
280 <  if test -f "$cgal_makefile"; then
281 <
282 <    cat >config.tmp.Makefile <<EOF
283 < include $cgal_makefile
284 < default:
285 <        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
286 <        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
287 <        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
288 <        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
289 <        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
290 <        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
291 <        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
292 <        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
293 <        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
294 <        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
295 <        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
296 <        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
297 < EOF
298 <
299 <    make -s -f config.tmp.Makefile
300 <    . config.tmp.cgalvariables
301 <
302 <    rm -f config.tmp.Makefile config.tmp.cgalvariables
303 <
304 <    if test "x$CGAL_INCLDIR" = "x"; then
305 <      CGAL_INCLDIR=""
306 <    fi
307 <
308 <    if test "x$CGAL_LIBDIR" = "x"; then
309 <      CGAL_LIBDIR=""
310 <    fi
311 <
312 <    if test "x$CGAL_RLIBDIR" = "x"; then
313 <      CGAL_RLIBDIR=""
314 <    fi
315 <
316 <    if test "x$LEDA_INCLDIR" = "x"; then
317 <      LEDA_INCLDIR=""
318 <    fi
319 <
320 <    if test "x$LEDA_LIBDIR" = "x"; then
321 <      LEDA_LIBDIR=""
322 <    fi
323 <
324 <    if test "x$LEDA_RLIBDIR" = "x"; then
325 <      LEDA_RLIBDIR=""
326 <    fi
327 <
328 <    if test "x$GMP_INCLDIR" = "x"; then
329 <      GMP_INCLDIR=""
330 <    fi
331 <
332 <    if test "x$GMP_LIBDIR" = "x"; then
333 <      GMP_LIBDIR=""
334 <    fi
335 <
336 <    if test "x$GMP_RLIBDIR" = "x"; then
337 <      GMP_RLIBDIR=""
338 <    fi
339 <
340 <    AC_MSG_RESULT(CGAL_OS_COMPILER=   $CGAL_OS_COMPILER)
341 <    AC_MSG_RESULT(CGAL_INCLDIR=       $CGAL_INCLDIR)
342 <    AC_MSG_RESULT(CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR)
343 <    AC_MSG_RESULT(CGAL_LIBDIR=        $CGAL_LIBDIR)
344 <    AC_MSG_RESULT(CGAL_CXXFLAGS=      $CGAL_CXXFLAGS)
345 <    AC_MSG_RESULT(LEDA_INCLDIR=       $LEDA_INCLDIR)
346 <    AC_MSG_RESULT(LEDA_LIBDIR=        $LEDA_LIBDIR)
347 <    AC_MSG_RESULT(GMP_INCLDIR=        $GMP_INCLDIR)
348 <    AC_MSG_RESULT(GMP_LIBDIR=         $GMP_LIBDIR)
349 <
350 <    AC_LANG_PUSH(C++)
351 <    save_CXXFLAGS="$CXXFLAGS"
352 <    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
353 <    AC_CHECK_HEADER(CGAL/Cartesian.h, cgal=yes, cgal=no)
354 <    CXXFLAGS="$save_CXXFLAGS"
355 <
356 <    if test "x$cgal" = xyes; then
357 <      AC_MSG_CHECKING([for CGAL version])
358 <      LOCATION=${CGAL_INCLDIR}
359 <      LOCATION=${LOCATION:-/usr/include}
360 <      if test -f $LOCATION/CGAL/version.h; then
361 <        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
362 <      else
363 <        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
364 <      fi
365 < changequote({, })dnl
366 <      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
367 < changequote([, ])dnl
368 <        AC_MSG_RESULT([($CGAL_VERSION) yes])
369 <      else
370 <        AC_MSG_RESULT([($CGAL_VERSION) no])
371 <        cgal=no
372 <      fi
373 <    fi
374 <
375 <    if test "x$cgal" = xyes; then
376 <      CGAL_LIBS="-lCGAL"
377 <      AC_MSG_CHECKING([whether CGAL uses LEDA])
378 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
379 <        CGAL_USES_LEDA=yes
380 <        AC_MSG_RESULT([yes])
381 <        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
382 <      else
383 <        AC_MSG_RESULT([no])
384 <        CGAL_USES_LEDA=no
385 <      fi
386 <
387 <      AC_MSG_CHECKING([whether CGAL uses GMP])
388 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
389 <        CGAL_USES_GMP=yes
390 <        AC_MSG_RESULT([yes])
391 <        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
392 <      else
393 <        AC_MSG_RESULT([no])
394 <        CGAL_USES_GMP=no
395 <      fi
396 <
397 <      CGAL_LIBS="$CGAL_LIBS -lm"
398 <
399 <      CGAL_CXXFLAGS="-ftemplate-depth-50"
400 <
401 <      AC_MSG_RESULT(CGAL_USES_LEDA=     $CGAL_USES_LEDA)
402 <      AC_MSG_RESULT(CGAL_USES_GMP =     $CGAL_USES_GMP)
403 <      AC_MSG_RESULT(CGAL_INCLDIR  =     $CGAL_INCLDIR)
404 <      AC_MSG_RESULT(CGAL_LIBDIR   =     $CGAL_LIBDIR)
405 <      AC_MSG_RESULT(CGAL_DEFINES  =     $CGAL_DEFINES)
406 <      AC_MSG_RESULT(CGAL_CXXFLAGS =     $CGAL_CXXFLAGS)
407 <      AC_MSG_RESULT(CGAL_LIBS     =     $CGAL_LIBS)
408 <    fi
409 <
410 <    if test "x$cgal" = xyes; then
411 <      save_LIBS="$LIBS"
412 <      LIBS="$LIBS -L$CGAL_LIBDIR"
413 <      if test "x$CGAL_USES_LEDA" = xyes; then
414 <        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
415 <      fi
416 <      # if test "x$CGAL_USES_GMP" = xyes; then
417 <      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
418 <      # fi
419 <      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)
420 <      LIBS="$save_LIBS"
421 <    fi
422 <
423 <  fi
424 <  AC_LANG_POP()
425 <
236 > if test "$acx_cgal_found" == yes; then
237 >        USE_CGAL=yes
238 >        AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
239 >        AC_SUBST(CGAL_CXXFLAGS)
240 >        AC_SUBST(CGAL_LDFLAGS)
241 >        AC_SUBST(CGAL_CPPFLAGS)
242 >        AC_SUBST(CGAL_LIBS)
243   fi
427 –
428 – if test "x$cgal" = xyes; then
429 –  USE_CGAL=yes
430 –  AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
431 –  AC_DEFINE_UNQUOTED(CGAL_VERSION, $CGAL_VERSION, [The CGAL version number.])
432 – changequote({, })dnl
433 –  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
434 – changequote([, ])dnl
435 –    AC_MSG_WARN(*****************************************************)
436 –    AC_MSG_WARN(*** Warning: Your CGAL version is newer than the  ***)
437 –    AC_MSG_WARN(*** supported versions. It may still work though. ***)
438 –    AC_MSG_WARN(*****************************************************)
439 –  fi
440 – else
441 –   if test "x$cgal_makefile" != xno; then
442 –    AC_MSG_RESULT(No CGAL support. These are not the droids you want.)
443 –  fi
444 –  CGAL_INCLDIR=
445 –  CGAL_LIBDIR=
446 –  CGAL_RLIBDIR=
447 –  CGAL_DEFINES=
448 –  CGAL_CXXFLAGS=
449 –  CGAL_LIBS=
450 – fi
451 –
244   AC_SUBST(USE_CGAL)
453 – CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
454 – AC_SUBST(CGAL_INC_DIR)
455 – CGAL_LIB_DIR=${CGAL_LIBDIR}
456 – AC_SUBST(CGAL_LIB_DIR)
457 – CGAL_RLIB_DIR=${CGAL_RLIBDIR}
458 – AC_SUBST(CGAL_RLIB_DIR)
459 – AC_SUBST(CGAL_DEFINES)
460 – AC_SUBST(CGAL_CXXFLAGS)
461 – AC_SUBST(CGAL_LIBS)
245  
463 – dnl CHECK_MKL
246  
247   BB_ENABLE_DOXYGEN
248  
467 – AC_EXEEXT
468 – AC_OBJEXT
469 – OBJEXT=".$OBJEXT"
470 –
471 – OOPSE=oopse
472 –
473 – dnl **** define home dir of oopse
474 – if test "x${prefix}" = "xNONE"
475 – then
476 –  OOPSE_HOME=${ac_default_prefix}/oopse
477 – else
478 –  OOPSE_HOME=${prefix}/oopse
479 – fi
480 – AC_ARG_ENABLE(oopse-home,
481 – [  --enable-oopse-home=DIR      define oopse home dir [PREFIX/oopse]],
482 – [OOPSE_HOME="${enableval}"])
483 –
484 – case "x$INSTALL" in
485 –   x/*) ;;
486 –   *) INSTALL=`pwd`/ac-tools/"shtool install -c" ;
487 – esac
488 –
489 – MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
490 –
491 – dnl **** Define CFLAGS etc empty to prevent configure from setting them
492 – CFLAGS=${CFLAGS-""}
493 – CXXFLAGS=${CXXFLAGS-""}
494 – CPPFLAGS=${CPPFLAGS-""}
495 – FFLAGS=${FFLAGS-""}
496 – F90FLAGS=${F90FLAGS-""}
497 – LDFLAGS=${LDFLAGS-""}
498 – DEBUG=${DEBUG-"-g"}
499 –
500 – case $debug in
501 –  1)
502 –     FFLAGS="$DEBUG $FFLAGS"
503 –     F90FLAGS="$DEBUG $F90FLAGS"
504 –     ;;
505 –  *)
506 –     ;;
507 – esac
508 –
509 –
249   AC_SUBST(EXEEXT)
250   AC_SUBST(OBJEXT)
251   AC_SUBST(BATEXT)
# Line 517 | Line 256 | AC_SUBST(CPPFLAGS)
256   AC_SUBST(CFLAGS)
257   AC_SUBST(CXXFLAGS)
258   AC_SUBST(CPPFLAGS)
259 < AC_SUBST(FFLAGS)
521 < AC_SUBST(F90FLAGS)
259 > AC_SUBST(FCFLAGS)
260   AC_SUBST(LDFLAGS)
523 – AC_SUBST(PREPFLAG)
261   AC_SUBST(PREPDEFFLAG)
262   AC_SUBST(F90_MODULE_NAMES)
263 < AC_CONFIG_HEADER([src/config.h])
527 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp], [chmod 0755 scripts/*])
263 > AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/math/Makefile src/integrators/Makefile src/applications/atom2md/Makefile scripts/filepp], [chmod 0755 scripts/*])
264  
265   AC_OUTPUT

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines