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 957 by gezelter, Tue May 16 20:38:23 2006 UTC vs.
Revision 1085 by chuckv, Mon Oct 23 18:11:06 2006 UTC

# Line 47 | Line 47 | AC_SUBST(debug)
47   fi
48   AC_SUBST(debug)
49  
50 + AC_ARG_ENABLE(single, [AC_HELP_STRING([--enable-single],[compile OOPSE in single precision])], ok=$enableval, ok=no)
51 + AC_ARG_ENABLE(float, [AC_HELP_STRING([--enable-float],[synonym for --enable-single])], ok=$enableval)
52 + if test "$ok" = "yes"; then
53 +        AC_DEFINE(SINGLE_PRECISION,1,[Define to compile in single precision.])
54 +        USE_SINGLE_PRECISION=yes
55 +        AC_SUBST(USE_SINGLE_PRECISION)
56 + fi
57 +
58   # Checks for programs.
59 < AC_PROG_CXX([icpc icc pgCC pathCC c++ xlc++ xlC g++ CC])
60 < AC_PROG_CC([icc pgcc pathcc cc xlc gcc])
61 < AC_PROG_FC([ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
59 > AC_PROG_CXX([mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC])
60 > AC_PROG_CC([mpicc icc pathcc pgcc cc xlc gcc])
61 > AC_PROG_FC([mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort], 95)
62   AC_PROG_CPP
63   AC_PROG_EGREP
64   AC_PROG_LN_S
# Line 333 | Line 341 | EOF
341  
342      AC_LANG_PUSH(C++)
343      save_CXXFLAGS="$CXXFLAGS"
344 <    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
344 >    CXXFLAGS="$CXXFLAGS $CGAL_CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
345      AC_CHECK_HEADER(CGAL/Cartesian.h, cgal=yes, cgal=no)
346      CXXFLAGS="$save_CXXFLAGS"
347  
# Line 380 | Line 388 | changequote([, ])dnl
388  
389        CGAL_LIBS="$CGAL_LIBS -lm"
390  
391 <      CGAL_CXXFLAGS="-ftemplate-depth-50"
391 >      CGAL_CXXFLAGS="-ftemplate-depth-50 $CGAL_CXXFLAGS"
392  
393        AC_MSG_RESULT(CGAL_USES_LEDA=     $CGAL_USES_LEDA)
394        AC_MSG_RESULT(CGAL_USES_GMP =     $CGAL_USES_GMP)
# Line 400 | Line 408 | changequote([, ])dnl
408        # if test "x$CGAL_USES_GMP" = xyes; then
409        #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
410        # fi
411 <      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)
411 >      AC_CHECK_CXX_LIB(CGAL, ::CGAL::Cartesian<int>::Point_2, [#include <CGAL/Cartesian.h>], [::CGAL::Cartesian<int>::Point_2 P], [cgal=yes], [cgal=no], $CGAL_CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR)
412        LIBS="$save_LIBS"
413      fi
414  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines