ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/ac-tools/configure.in
(Generate patch)

Comparing trunk/OOPSE-3.0/ac-tools/configure.in (file contents):
Revision 1997 by tim, Fri Feb 11 22:35:51 2005 UTC vs.
Revision 2518 by tim, Fri Dec 16 21:52:50 2005 UTC

# Line 5 | Line 5 | builtin(include, ac-tools/aclocal.m4)
5  
6   builtin(include, ac-tools/fortran90.m4)
7   builtin(include, ac-tools/aclocal.m4)
8 + builtin(include, ac-tools/AC_CXX_HAVE_STL.m4)
9 + builtin(include, ac-tools/AC_CXX_NAMESPACES.m4)
10 + builtin(include, ac-tools/AC_CXX_STD.m4)
11  
12   AC_CONFIG_SRCDIR([src/applications/oopse/oopse.cpp])
13  
# Line 31 | Line 34 | AC_PROG_CC([icc xlc gcc cc])
34  
35  
36   dnl Checks for C compiler
37 < AC_PROG_CC([icc xlc gcc cc])
37 > AC_PROG_CC([pathcc icc xlc gcc cc])
38  
39   dnl Checks for C++ compiler
40 < AC_PROG_CXX([icpc icc xlc++ xlC CC g++ c++])
40 > AC_PROG_CXX([pathCC icpc icc xlc++ xlC CC g++ c++])
41  
42 + dnl Checks for C preprocessor
43 + AC_PROG_CPP
44 +
45 + dnl Checks for grep and egrep
46 + AC_PROG_EGREP
47 +
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=""
# Line 83 | Line 92 | AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf9
92  
93   dnl Fortran 90 compilation checks are next
94  
95 < AC_PROG_F90([ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
95 > AC_PROG_F90([pathf95 ifort ifc f90 xlf90 pgf90 epcf90 f95 xlf95 lf95 fort g95])
96   dnl Check the flag for Fortran90 preprocessing
97   ACX_PROG_F90_PREPFLAG
98   dnl Check to see if a flag is required for preprocessing defines
# Line 115 | Line 124 | AC_LANG_PUSH(C)
124   AC_SUBST(F90_MODULE_NAMES)
125   AC_LANG_POP
126  
127 < AC_LANG_PUSH(C)
128 < 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)
129 < AC_CHECK_FUNCS(pstat_getstatic sysmp getsysinfo sysctl table)
127 > AC_LANG_CPLUSPLUS
128 > AC_HEADER_STDC
129 > AC_CXX_NAMESPACES
130 > AC_CXX_STD
131 >
132 > dnl Checks for libraries.
133 > AC_CHECK_LIB(m, asin, , exit)
134 >
135 > ACX_CHECK_ZLIB
136 > dnl Checks for header files.
137 > 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])
138 > AC_LANG_CPLUSPLUS
139 > AC_CHECK_HEADERS([ctype.h iostream fstream sstream strstream])
140 > AC_LANG_C
141 > AC_CHECK_FUNCS([rint snprintf sranddev strcasecmp strncasecmp stricmp strnicmp pstat_getstatic sysmp getsysinfo sysctl table])
142   # special check for _system_configuration because AIX <4.3.2 do not
143   # contain the `physmem' member.
144   AC_MSG_CHECKING([for external symbol _system_configuration])
# Line 127 | Line 148 | AC_TRY_COMPILE([#include <sys/systemcfg.h>],
148    AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
149              [Define if you have the _system_configuration variable.])],
150    [AC_MSG_RESULT([no])])
151 + AC_HEADER_TIME
152  
153 + dnl Checks for typedefs, structures, and compiler characteristics.
154 + AC_CHECK_TYPES(clock_t)
155 + AC_C_CONST
156 + AC_C_INLINE
157  
132 – dnl undef HAVE__SYSTEM_CONFIGURATION
158  
134 –
159   dnl check for system getopt
160   adl_FUNC_GETOPT_LONG
161  
# Line 147 | Line 171 | AC_PROG_INSTALL
171       ;;
172   esac
173  
174 + AC_LANG_CPLUSPLUS
175 + # AC_CPP_FUNC
176 + # ------------------ #
177 + # Checks to see if ANSI C99 CPP variable __func__ works.
178 + # If not, perhaps __FUNCTION__ works instead.
179 + # If not, we'll just define __func__ to "".
180 + AC_DEFUN([AC_CPP_FUNC],
181 + [AC_REQUIRE([AC_PROG_CC_STDC])dnl
182 + AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
183 + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
184 + [[const char *foo = __func__;]])],
185 +  [ac_cv_cpp_func=yes],
186 +  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
187 + [[const char *foo = __FUNCTION__;]])],
188 +  [ac_cv_cpp_func=__FUNCTION__],
189 +  [ac_cv_cpp_func=no])])])
190 + if test $ac_cv_cpp_func = __FUNCTION__; then
191 +  AC_DEFINE(__func__,__FUNCTION__,
192 +            [Define to __FUNCTION__ or "" if `__func__' does not conform to
193 + ANSI C.])
194 + elif test $ac_cv_cpp_func = no; then
195 +  AC_DEFINE(__func__,"",
196 +            [Define to __FUNCTION__ or "" if `__func__' does not conform to
197 + ANSI C.])
198 + fi
199 + ])# AC_CPP_FUNC
200 +
201 + AC_CPP_FUNC
202 + AC_SUBST(__func__)
203 + AC_LANG_C
204 +
205   AC_PROG_INSTALL
206   AC_PROG_LN_S
207   AC_PROG_MAKE_SET
208   AC_PROG_RANLIB
209   AC_PROG_YACC
210   AC_PROG_LEX
211 + AX_SYS_PERLSHARPBANG
212   AC_CHECK_PROG(AR, ar, ar, NONE)
213   if test "$AR" = "NONE"; then
214    AC_MSG_ERROR(--> Can't find \`ar'!)
215    AC_CACHE_SAVE
216    exit 1
217   fi
218 +
219 + AC_PATH_PROG(PS, ps)
220 + AC_CACHE_CHECK([for POSIX or BSD ps syntax], ac_cv_prog_ps_syntax, [
221 +        if $PS ax -o rss > /dev/null 2>&1; then
222 +                ac_cv_prog_ps_ax=yes
223 +        else
224 +                ac_cv_prog_ps_ax=no
225 +        fi
226 +        if $PS -ef -o rss > /dev/null 2>&1; then
227 +                ac_cv_prog_ps_ef=yes
228 +        else
229 +                ac_cv_prog_ps_ef=no
230 +        fi
231 +        if test "$ac_cv_prog_ps_ax" = yes; then
232 +                ac_cv_prog_ps_syntax=BSD
233 +        else
234 +                if test "$ac_cv_prog_ps_ef" = yes; then
235 +                        ac_cv_prog_ps_syntax=POSIX
236 +                else
237 +                        AC_MSG_ERROR(Could not determine ps syntax)
238 +                fi
239 +        fi
240 + ])
241  
242 + AC_DEFINE_UNQUOTED(PSCOMMAND, $PS, [Path to ps program])
243 + AC_DEFINE([OBAPI], [], [Used to export symbols for DLL / shared library builds])
244  
245 +
246 + if test "$ac_cv_prog_ps_syntax" = BSD; then
247 +  AC_DEFINE(PSTYPE_IS_BSD, 1, [ps uses BSD-style arguments])
248 + else
249 +   if test "$ac_cv_prog_ps_syntax" = POSIX; then
250 +       AC_DEFINE(PSTYPE_IS_POSIX, 1, [ps uses POSIX-style arguments])
251 +   else
252 +       AC_MSG_ERROR(Unknown ps syntax type!)
253 +   fi
254 + fi
255 +
256   AC_ARG_WITH(mpi,
257          [AC_HELP_STRING([--with-mpi=<prefix>],
258                  [compile with MPI installed in <prefix> [default=no]])],
# Line 180 | Line 272 | AC_ARG_WITH(sprng,
272   fi
273   AC_SUBST(USE_MPI)
274  
275 < AC_ARG_WITH(sprng,
276 <        [AC_HELP_STRING([--with-sprng=<prefix>],
277 <                [compile with SPRNG installed in <prefix> [default=/usr/local]])],
278 <        with_sprng=$withval,
279 <        with_sprng="/usr/local")
275 > dnl AC_ARG_WITH(sprng,
276 > dnl     [AC_HELP_STRING([--with-sprng=<prefix>],
277 > dnl             [compile with SPRNG installed in <prefix> [default=/usr/local]])],
278 > dnl     with_sprng=$withval,
279 > dnl     with_sprng="/usr/local")
280 > dnl
281 > dnl case "x$with_sprng" in
282 > dnl        xyes | "x")  USE_SPRNG=yes;;
283 > dnl        xno) USE_SPRNG=no ;;
284 > dnl        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
285 > dnl esac
286 > dnl if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
287 > dnl        SPRNG="/usr/local"
288 > dnl fi
289 > dnl if test "$USE_SPRNG" = "yes"; then
290 > dnl         ACX_SPRNG
291 > dnl fi
292 > dnl AC_SUBST(USE_SPRNG)
293  
294 < case "x$with_sprng" in
295 <        xyes | "x")  USE_SPRNG=yes;;
296 <        xno) USE_SPRNG=no ;;
192 <        *) SPRNG="$with_sprng"; USE_SPRNG=yes ;;
193 < esac
194 < if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then
195 <        SPRNG="/usr/local"
196 < fi
197 < if test "$USE_SPRNG" = "yes"; then
198 <        ACX_SPRNG
199 < fi
200 < AC_SUBST(USE_SPRNG)
294 > dnl ########################################
295 > dnl # Check for CGAL headers and libraries #
296 > dnl ########################################
297  
298 + USE_CGAL=no
299 + cgal_makefile=auto
300 + AC_ARG_WITH(cgal-makefile,[  --with-cgal-makefile=FILE  CGAL makefile that should be used],       cgal_makefile="$withval")
301  
302 < CHECK_MKL
302 > if test "x$cgal_makefile" != xno; then
303 >
304 >  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
305 >    cgal_makefile="$CGAL_MAKEFILE"
306 >  fi
307 >
308 >  AC_MSG_CHECKING(for cgal_makefile: $cgal_makefile)
309 >
310 >  if test -f "$cgal_makefile"; then
311 >
312 >    cat >config.tmp.Makefile <<EOF
313 > include $cgal_makefile
314 > default:
315 >        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
316 >        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
317 >        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
318 >        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
319 >        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
320 >        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
321 >        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
322 >        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
323 >        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
324 >        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
325 >        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
326 >        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
327 > EOF
328  
329 +    make -s -f config.tmp.Makefile
330 +    . config.tmp.cgalvariables
331 +
332 +    rm -f config.tmp.Makefile config.tmp.cgalvariables
333 +
334 +    if test "x$CGAL_INCLDIR" = "x"; then
335 +      CGAL_INCLDIR=""
336 +    fi
337 +
338 +    if test "x$CGAL_LIBDIR" = "x"; then
339 +      CGAL_LIBDIR=""
340 +    fi
341 +
342 +    if test "x$CGAL_RLIBDIR" = "x"; then
343 +      CGAL_RLIBDIR=""
344 +    fi
345 +
346 +    if test "x$LEDA_INCLDIR" = "x"; then
347 +      LEDA_INCLDIR=""
348 +    fi
349 +
350 +    if test "x$LEDA_LIBDIR" = "x"; then
351 +      LEDA_LIBDIR=""
352 +    fi
353 +
354 +    if test "x$LEDA_RLIBDIR" = "x"; then
355 +      LEDA_RLIBDIR=""
356 +    fi
357 +
358 +    if test "x$GMP_INCLDIR" = "x"; then
359 +      GMP_INCLDIR=""
360 +    fi
361 +
362 +    if test "x$GMP_LIBDIR" = "x"; then
363 +      GMP_LIBDIR=""
364 +    fi
365 +
366 +    if test "x$GMP_RLIBDIR" = "x"; then
367 +      GMP_RLIBDIR=""
368 +    fi
369 +
370 +    AC_MSG_RESULT(CGAL_OS_COMPILER=   $CGAL_OS_COMPILER)
371 +    AC_MSG_RESULT(CGAL_INCLDIR=       $CGAL_INCLDIR)
372 +    AC_MSG_RESULT(CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR)
373 +    AC_MSG_RESULT(CGAL_LIBDIR=        $CGAL_LIBDIR)
374 +    AC_MSG_RESULT(CGAL_CXXFLAGS=      $CGAL_CXXFLAGS)
375 +    AC_MSG_RESULT(LEDA_INCLDIR=       $LEDA_INCLDIR)
376 +    AC_MSG_RESULT(LEDA_LIBDIR=        $LEDA_LIBDIR)
377 +    AC_MSG_RESULT(GMP_INCLDIR=        $GMP_INCLDIR)
378 +    AC_MSG_RESULT(GMP_LIBDIR=         $GMP_LIBDIR)
379 +
380 +    AC_LANG_PUSH(C++)
381 +    save_CXXFLAGS="$CXXFLAGS"
382 +    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
383 +    AC_CHECK_HEADER(CGAL/Cartesian.h, cgal=yes, cgal=no)
384 +    CXXFLAGS="$save_CXXFLAGS"
385 +
386 +    if test "x$cgal" = xyes; then
387 +      AC_MSG_CHECKING([for CGAL version])
388 +      LOCATION=${CGAL_INCLDIR}
389 +      LOCATION=${LOCATION:-/usr/include}
390 +      if test -f $LOCATION/CGAL/version.h; then
391 +        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
392 +      else
393 +        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
394 +      fi
395 + changequote({, })dnl
396 +      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
397 + changequote([, ])dnl
398 +        AC_MSG_RESULT([($CGAL_VERSION) yes])
399 +      else
400 +        AC_MSG_RESULT([($CGAL_VERSION) no])
401 +        cgal=no
402 +      fi
403 +    fi
404 +
405 +    if test "x$cgal" = xyes; then
406 +      CGAL_LIBS="-lCGAL"
407 +      AC_MSG_CHECKING([whether CGAL uses LEDA])
408 +      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
409 +        CGAL_USES_LEDA=yes
410 +        AC_MSG_RESULT([yes])
411 +        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
412 +      else
413 +        AC_MSG_RESULT([no])
414 +        CGAL_USES_LEDA=no
415 +      fi
416 +
417 +      AC_MSG_CHECKING([whether CGAL uses GMP])
418 +      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
419 +        CGAL_USES_GMP=yes
420 +        AC_MSG_RESULT([yes])
421 +        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
422 +      else
423 +        AC_MSG_RESULT([no])
424 +        CGAL_USES_GMP=no
425 +      fi
426 +
427 +      CGAL_LIBS="$CGAL_LIBS -lm"
428 +
429 +      CGAL_CXXFLAGS="-ftemplate-depth-50"
430 +
431 +      AC_MSG_RESULT(CGAL_USES_LEDA=     $CGAL_USES_LEDA)
432 +      AC_MSG_RESULT(CGAL_USES_GMP =     $CGAL_USES_GMP)
433 +      AC_MSG_RESULT(CGAL_INCLDIR  =     $CGAL_INCLDIR)
434 +      AC_MSG_RESULT(CGAL_LIBDIR   =     $CGAL_LIBDIR)
435 +      AC_MSG_RESULT(CGAL_DEFINES  =     $CGAL_DEFINES)
436 +      AC_MSG_RESULT(CGAL_CXXFLAGS =     $CGAL_CXXFLAGS)
437 +      AC_MSG_RESULT(CGAL_LIBS     =     $CGAL_LIBS)
438 +    fi
439 +
440 +    if test "x$cgal" = xyes; then
441 +      save_LIBS="$LIBS"
442 +      LIBS="$LIBS -L$CGAL_LIBDIR"
443 +      if test "x$CGAL_USES_LEDA" = xyes; then
444 +        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
445 +      fi
446 +      # if test "x$CGAL_USES_GMP" = xyes; then
447 +      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
448 +      # fi
449 +      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)
450 +      LIBS="$save_LIBS"
451 +    fi
452 +
453 +  fi
454 +  AC_LANG_POP()
455 +
456 + fi
457 +
458 + if test "x$cgal" = xyes; then
459 +  USE_CGAL=yes
460 +  AC_DEFINE(HAVE_CGAL, 1, [Is defined if the CGAL library is available.])
461 +  AC_DEFINE_UNQUOTED(CGAL_VERSION, $CGAL_VERSION, [The CGAL version number.])
462 + changequote({, })dnl
463 +  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
464 + changequote([, ])dnl
465 +    AC_MSG_WARN(*****************************************************)
466 +    AC_MSG_WARN(*** Warning: Your CGAL version is newer than the  ***)
467 +    AC_MSG_WARN(*** supported versions. It may still work though. ***)
468 +    AC_MSG_WARN(*****************************************************)
469 +  fi
470 + else
471 +   if test "x$cgal_makefile" != xno; then
472 +    AC_MSG_RESULT(No CGAL support. These are not the droids you want.)
473 +  fi
474 +  CGAL_INCLDIR=
475 +  CGAL_LIBDIR=
476 +  CGAL_RLIBDIR=
477 +  CGAL_DEFINES=
478 +  CGAL_CXXFLAGS=
479 +  CGAL_LIBS=
480 + fi
481 +
482 + AC_SUBST(USE_CGAL)
483 + CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
484 + AC_SUBST(CGAL_INC_DIR)
485 + CGAL_LIB_DIR=${CGAL_LIBDIR}
486 + AC_SUBST(CGAL_LIB_DIR)
487 + CGAL_RLIB_DIR=${CGAL_RLIBDIR}
488 + AC_SUBST(CGAL_RLIB_DIR)
489 + AC_SUBST(CGAL_DEFINES)
490 + AC_SUBST(CGAL_CXXFLAGS)
491 + AC_SUBST(CGAL_LIBS)
492 +
493 + dnl CHECK_MKL
494 +
495   BB_ENABLE_DOXYGEN
496  
497   AC_EXEEXT
# Line 264 | Line 554 | AC_CONFIG_FILES([make/Makefile src/utils/Makefile])
554   AC_SUBST(PREPDEFFLAG)
555   AC_SUBST(F90_MODULE_NAMES)
556   AC_CONFIG_HEADER([src/config.h])
557 < AC_CONFIG_FILES([make/Makefile src/utils/Makefile])
557 > AC_CONFIG_FILES([make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp], [chmod 0755 scripts/*])
558  
559   AC_OUTPUT

Diff Legend

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