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 502 by gezelter, Thu Apr 14 21:41:56 2005 UTC vs.
Revision 1197 by chuckv, Thu Dec 6 20:40:07 2007 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/CGAL.m4)
13  
14 < AC_CONFIG_SRCDIR([src/applications/oopse/oopse.cpp])
14 > # who am i
15 > AC_CANONICAL_HOST
16  
17   AC_PREFIX_DEFAULT("/usr/local")
18  
# Line 14 | Line 20 | AC_SUBST(PROGNAME)
20   PROGNAME="oopse"
21   AC_SUBST(PROGNAME)
22  
23 + AC_EXEEXT
24 + AC_OBJEXT
25 + OBJEXT=".$OBJEXT"
26 +
27 + OOPSE=oopse
28 +
29 + dnl **** define home dir of oopse
30 + if test "x${prefix}" = "xNONE"
31 + then
32 +  OOPSE_HOME=${ac_default_prefix}/oopse
33 + else
34 +  OOPSE_HOME=${prefix}/oopse
35 + fi
36 + AC_ARG_ENABLE(oopse-home,
37 + [  --enable-oopse-home=DIR      define oopse home dir [PREFIX/oopse]],
38 + [OOPSE_HOME="${enableval}"])
39 +
40   # there are two ways to do debugging.  One with the --enable-debug flag
41   # and one using the DEBUG environment variable
42  
# Line 25 | Line 48 | AC_SUBST(debug)
48   fi
49   AC_SUBST(debug)
50  
51 < # who am i
52 < AC_CANONICAL_HOST
51 > AC_ARG_ENABLE(single, [AC_HELP_STRING([--enable-single],[compile OOPSE in single precision])], ok=$enableval, ok=no)
52 > AC_ARG_ENABLE(float, [AC_HELP_STRING([--enable-float],[synonym for --enable-single])], ok=$enableval)
53 > 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 <
60 <
61 < dnl Checks for C compiler
62 < AC_PROG_CC([icc xlc gcc cc])
63 <
64 < dnl Checks for C++ compiler
65 < AC_PROG_CXX([icpc icc xlc++ xlC CC g++ c++])
66 <
67 < dnl If we are not running g++ then we might need some other flags
68 < dnl to get the templates compiled correctly
69 < OOPSE_TEMPLATE_FLAGS=""
70 < if test $ac_cv_prog_gxx = no; then
71 <  AC_MSG_CHECKING([checking whether ${CXX} accepts -ptused -no_prelink])
72 <  echo 'void f(){}' > conftest.cc
73 <  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
74 <    AC_MSG_RESULT(yes)
75 <    OOPSE_TEMPLATE_FLAGS="-ptused -no_prelink"
76 <  else
77 <    AC_MSG_RESULT(no)
78 <  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 <    
75 <
76 <    EXTRA_CC_FLAG=${EXTRA_CC_FLAG}" -LANG:std"
77 <  else
78 <    AC_MSG_RESULT(no)
79 <  fi
59 > # Checks for programs.
60 > AC_PROG_CXX([mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC])
61 > AC_PROG_CC([mpicc icc pathcc pgcc cc xlc gcc])
62 > AC_PROG_FC([mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
63 > AC_PROG_CPP
64 > AC_PROG_EGREP
65 > AC_PROG_LN_S
66 > AC_PROG_MAKE_SET
67 > AC_PROG_RANLIB
68 > AX_SYS_PERLSHARPBANG
69 > AC_PROG_INSTALL
70 > case "x$INSTALL" in
71 >   x/*) ;;
72 >   *) INSTALL=`pwd`/ac-tools/"shtool install -c" ;
73 > esac
74 > MKINSTALLDIRS=`pwd`/ac-tools/"shtool mkdir -p -f"
75 > AC_CHECK_PROG(AR, ar, ar, NONE)
76 > if test "$AR" = "NONE"; then
77 >  AC_CACHE_SAVE
78 >  exit 1
79   fi
80 < AC_SUBST(OOPSE_TEMPLATE_FLAGS)
81 < AC_SUBST(EXTRA_CC_FLAG)
80 > AC_PATH_PROG(PS, ps)
81 > AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
82 >        if $PS ax -o rss > /dev/null 2>&1; then
83 >                ac_cv_prog_ps_ax=yes
84 >        else
85 >                ac_cv_prog_ps_ax=no
86 >        fi
87 >        if $PS -ef -o rss > /dev/null 2>&1; then
88 >                ac_cv_prog_ps_ef=yes
89 >        else
90 >                ac_cv_prog_ps_ef=no
91 >        fi
92 >        if test "$ac_cv_prog_ps_ax" = yes; then
93 >                ac_cv_prog_ps_syntax=BSD
94 >        else
95 >                if test "$ac_cv_prog_ps_ef" = yes; then
96 >                        ac_cv_prog_ps_syntax=POSIX
97 >                else
98 >                        AC_MSG_ERROR(Could not determine ps syntax)
99 >                fi
100 >        fi
101 > ])
102 > AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
103 > if test "$ac_cv_prog_ps_syntax" = BSD; then
104 >  AC_DEFINE(PSTYPE_IS_BSD, 1, [ps uses BSD-style arguments])
105 > else
106 >   if test "$ac_cv_prog_ps_syntax" = POSIX; then
107 >       AC_DEFINE(PSTYPE_IS_POSIX, 1, [ps uses POSIX-style arguments])
108 >   else
109 >       AC_MSG_ERROR(Unknown ps syntax type!)
110 >   fi
111 > fi
112  
113 < dnl Fortran 90 compilation checks are next
114 <
86 < AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
113 > AC_LANG_PUSH(Fortran)
114 > AC_FC_SRCEXT(F90)
115   dnl Check the flag for Fortran90 preprocessing
116   ACX_PROG_F90_PREPFLAG
117   dnl Check to see if a flag is required for preprocessing defines
118   ACX_PROG_F90_PREPDEFFLAG
119 < AC_LANG_PUSH(Fortran 90)
120 < AC_LANG_PREPROC(Fortran 90)
121 < AC_F90_LIBRARY_LDFLAGS
122 < dnl How does Fortran mangle function names
95 < AC_F90_WRAPPERS
96 < AC_SUBST(F90_FUNC)
97 < AC_SUBST(F90_FUNC_)
119 > AC_FC_WRAPPERS
120 > AC_SUBST(FC_FUNC)
121 > AC_SUBST(FC_FUNC_)
122 > AC_FC_LIBRARY_LDFLAGS
123   dnl Fortran 90 module suffix
124   AC_CHECK_MODSUFFIX
125   dnl Fortran 90 module path specifier
# Line 115 | Line 140 | AC_LANG_POP
140   AC_SUBST(F90_MODULE_NAMES)
141   AC_LANG_POP
142  
143 < AC_LANG_PUSH(C)
144 < 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)
145 < AC_CHECK_FUNCS(pstat_getstatic sysmp getsysinfo sysctl table)
143 > AC_LANG_C
144 >
145 > dnl Checks for libraries.
146 > AC_CHECK_LIB(m, asin, , exit)
147 > ACX_CHECK_ZLIB
148 > ACX_CHECK_FFTW
149 >
150 >
151 > # Checks for header files.
152 > AC_HEADER_STDC
153 > 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])
154 >
155 > # Checks for typedefs, structures, and compiler characteristics.
156 > AC_HEADER_STDBOOL
157 > AC_C_CONST
158 > AC_C_INLINE
159 > AC_C_RESTRICT
160 > AC_TYPE_SIZE_T
161 > AC_HEADER_TIME
162 > AC_CHECK_TYPES(clock_t)
163 > AC_C_CONST
164 > AC_C_INLINE
165 >
166 > # Checks for library functions.
167 > AC_FUNC_MALLOC
168 > AC_FUNC_MEMCMP
169 > AC_FUNC_REALLOC
170 > AC_FUNC_SELECT_ARGTYPES
171 > AC_FUNC_STRFTIME
172 > AC_FUNC_STRTOD
173 > 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])
174 >
175   # special check for _system_configuration because AIX <4.3.2 do not
176   # contain the `physmem' member.
177   AC_MSG_CHECKING([for external symbol _system_configuration])
# Line 131 | Line 185 | adl_FUNC_GETOPT_LONG
185   dnl check for system getopt
186   adl_FUNC_GETOPT_LONG
187  
188 + AC_LANG_CPLUSPLUS
189 + AC_CXX_NAMESPACES
190 + AC_CXX_STD
191 + AC_CHECK_HEADERS([ctype.h iostream fstream sstream strstream])
192 + # AC_CPP_FUNC
193 + # ------------------ #
194 + # Checks to see if ANSI C99 CPP variable __func__ works.
195 + # If not, perhaps __FUNCTION__ works instead.
196 + # If not, we'll just define __func__ to "".
197 + AC_DEFUN([AC_CPP_FUNC],
198 + [AC_REQUIRE([AC_PROG_CC_STDC])dnl
199 + AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
200 + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
201 + [[const char *foo = __func__;]])],
202 +  [ac_cv_cpp_func=yes],
203 +  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
204 + [[const char *foo = __FUNCTION__;]])],
205 +  [ac_cv_cpp_func=__FUNCTION__],
206 +  [ac_cv_cpp_func=no])])])
207 + if test $ac_cv_cpp_func = __FUNCTION__; then
208 +  AC_DEFINE(__func__,__FUNCTION__,
209 +            [Define to __FUNCTION__ or "" if `__func__' does not conform to
210 + ANSI C.])
211 + elif test $ac_cv_cpp_func = no; then
212 +  AC_DEFINE(__func__,"",
213 +            [Define to __FUNCTION__ or "" if `__func__' does not conform to
214 + ANSI C.])
215 + fi
216 + ])# AC_CPP_FUNC
217 +
218 + AC_CPP_FUNC
219 + AC_SUBST(__func__)
220 +
221 +
222   dnl check for strong optimization options
223  
224   case $debug in
225    1)
226       ;;
227    *)
228 +   ACX_PROG_FC_MAXOPT
229     ACX_PROG_CC_MAXOPT
230     ACX_PROG_CXX_MAXOPT
142 –   ACX_PROG_F90_MAXOPT
231       ;;
232   esac
233  
234 < AC_PROG_INSTALL
235 < AC_PROG_LN_S
148 < AC_PROG_MAKE_SET
149 < AC_PROG_RANLIB
150 < AC_PROG_YACC
151 < AC_PROG_LEX
152 < AX_SYS_PERLSHARPBANG
153 < AC_CHECK_PROG(AR, ar, ar, NONE)
154 < if test "$AR" = "NONE"; then
155 <  AC_MSG_ERROR(--> Can't find \`ar'!)
156 <  AC_CACHE_SAVE
157 <  exit 1
158 < fi
234 > dnl OpenBabel needs this:
235 > AC_DEFINE([OBAPI], [], [Used to export symbols for DLL / shared library builds])
236  
160 – AC_PATH_PROG(PS, ps)
161 – AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
162 –        if $PS ax -o rss > /dev/null 2>&1; then
163 –                ac_cv_prog_ps_ax=yes
164 –        else
165 –                ac_cv_prog_ps_ax=no
166 –        fi
167 –        if $PS -ef -o rss > /dev/null 2>&1; then
168 –                ac_cv_prog_ps_ef=yes
169 –        else
170 –                ac_cv_prog_ps_ef=no
171 –        fi
172 –        if test "$ac_cv_prog_ps_ax" = yes; then
173 –                ac_cv_prog_ps_syntax=BSD
174 –        else
175 –                if test "$ac_cv_prog_ps_ef" = yes; then
176 –                        ac_cv_prog_ps_syntax=POSIX
177 –                else
178 –                        AC_MSG_ERROR(Could not determine ps syntax)
179 –                fi
180 –        fi
181 – ])
237  
183 – AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
184 –
185 – if test "$ac_cv_prog_ps_syntax" = BSD; then
186 –  AC_DEFINE(PSTYPE_IS_BSD, 1)
187 – else
188 –   if test "$ac_cv_prog_ps_syntax" = POSIX; then
189 –       AC_DEFINE(PSTYPE_IS_POSIX, 1)
190 –   else
191 –       AC_MSG_ERROR(Unknown ps syntax type!)
192 –   fi
193 – fi
194 –
238   AC_ARG_WITH(mpi,
239          [AC_HELP_STRING([--with-mpi=<prefix>],
240                  [compile with MPI installed in <prefix> [default=no]])],
# Line 211 | Line 254 | AC_SUBST(USE_MPI)
254   fi
255   AC_SUBST(USE_MPI)
256  
257 < dnl AC_ARG_WITH(sprng,
258 < dnl     [AC_HELP_STRING([--with-sprng=<prefix>],
216 < dnl             [compile with SPRNG installed in <prefix> [default=/usr/local]])],
217 < dnl     with_sprng=$withval,
218 < dnl     with_sprng="/usr/local")
219 < 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)
257 > dnl check for CGAL library
258 > ACX_CGAL
259  
260 < dnl ########################################
261 < dnl # Check for CGAL headers and libraries #
262 < dnl ########################################
263 <
264 < USE_CGAL=no
265 < cgal_makefile=auto
266 < AC_ARG_WITH(cgal-makefile,[  --with-cgal-makefile=FILE  CGAL makefile that should be used],       cgal_makefile="$withval")
267 <
241 < if test "x$cgal_makefile" != xno; then
242 <
243 <  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
244 <    cgal_makefile="$CGAL_MAKEFILE"
245 <  fi
246 <
247 <  echo "cgal_makefile      $cgal_makefile"
248 <
249 <  if test -f "$cgal_makefile"; then
250 <
251 <    cat >config.tmp.Makefile <<EOF
252 < include $cgal_makefile
253 < default:
254 <        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
255 <        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
256 <        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
257 <        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
258 <        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
259 <        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
260 <        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
261 <        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
262 <        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
263 <        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
264 <        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
265 <        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
266 < EOF
267 <
268 <    make -s -f config.tmp.Makefile
269 <    . config.tmp.cgalvariables
270 <
271 <    rm -f config.tmp.Makefile config.tmp.cgalvariables
272 <
273 <    if test "x$CGAL_INCLDIR" = "x"; then
274 <      CGAL_INCLDIR=""
275 <    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 <
260 > if test "$acx_cgal_found" == yes; then
261 >        USE_CGAL=yes
262 >        AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
263 >        AC_SUBST(USE_CGAL)
264 >        AC_SUBST(CGAL_CXXFLAGS)
265 >        AC_SUBST(CGAL_LDFLAGS)
266 >        AC_SUBST(CGAL_CPPFLAGS)
267 >        AC_SUBST(CGAL_LIBS)
268   fi
269  
397 – if test "x$cgal" = xyes; then
398 –  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
270  
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)
435 –
436 – dnl CHECK_MKL
437 –
271   BB_ENABLE_DOXYGEN
272  
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 –
473 – case $debug in
474 –  1)
475 –     FFLAGS="$DEBUG $FFLAGS"
476 –     F90FLAGS="$DEBUG $F90FLAGS"
477 –     ;;
478 –  *)
479 –     ;;
480 – esac
481 –
482 –
273   AC_SUBST(EXEEXT)
274   AC_SUBST(OBJEXT)
275   AC_SUBST(BATEXT)
# Line 490 | Line 280 | AC_SUBST(CPPFLAGS)
280   AC_SUBST(CFLAGS)
281   AC_SUBST(CXXFLAGS)
282   AC_SUBST(CPPFLAGS)
283 < AC_SUBST(FFLAGS)
494 < AC_SUBST(F90FLAGS)
283 > AC_SUBST(FCFLAGS)
284   AC_SUBST(LDFLAGS)
496 – AC_SUBST(PREPFLAG)
285   AC_SUBST(PREPDEFFLAG)
286   AC_SUBST(F90_MODULE_NAMES)
287 < AC_CONFIG_HEADER([src/config.h])
500 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp], [chmod 0755 scripts/*])
287 > AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/math/Makefile src/applications/staticProps/Makefile scripts/filepp], [chmod 0755 scripts/*])
288  
289   AC_OUTPUT

Diff Legend

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