ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/configure
(Generate patch)

Comparing trunk/configure (file contents):
Revision 973 by gezelter, Thu May 25 14:54:41 2006 UTC vs.
Revision 1206 by chuckv, Sat Dec 8 00:15:09 2007 UTC

# Line 1 | Line 1
1   #! /bin/sh
2   # Guess values for system-dependent variables and create Makefiles.
3 < # Generated by GNU Autoconf 2.59 for OOPSE 3.0.
3 > # Generated by GNU Autoconf 2.59 for OOPSE 4.0.
4   #
5   # Report bugs to <gezelter@nd.edu>.
6   #
# Line 269 | Line 269 | PACKAGE_TARNAME='oopse'
269   # Identity of this package.
270   PACKAGE_NAME='OOPSE'
271   PACKAGE_TARNAME='oopse'
272 < PACKAGE_VERSION='3.0'
273 < PACKAGE_STRING='OOPSE 3.0'
272 > PACKAGE_VERSION='4.0'
273 > PACKAGE_STRING='OOPSE 4.0'
274   PACKAGE_BUGREPORT='gezelter@nd.edu'
275  
276   ac_unique_file="src/applications/oopse/oopse.cpp"
# Line 312 | Line 312 | ac_includes_default="\
312   # include <unistd.h>
313   #endif"
314  
315 < ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os PROGNAME debug USE_SINGLE_PRECISION CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC FC FCFLAGS ac_ct_FC CPP EGREP LN_S SET_MAKE RANLIB ac_ct_RANLIB PERLINTERP PERL_SHEBANG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PS FCFLAGS_F90 FCFLAGS_SRCEXT PREPDEFFLAG FCLIBS FC_FUNC FC_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES ZLIB_INC_DIR ZLIB_LIB_DIR ZLIB FFTW_INC_DIR FFTW_LIB_DIR FFTW_LIBS LIBOBJS POW_LIB CXXCPP __func__ MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI USE_CGAL CGAL_INC_DIR CGAL_LIB_DIR CGAL_RLIB_DIR CGAL_DEFINES CGAL_CXXFLAGS CGAL_LIBS DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS LTLIBOBJS'
315 > ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os PROGNAME debug USE_SINGLE_PRECISION CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC FC FCFLAGS ac_ct_FC CPP EGREP LN_S SET_MAKE RANLIB ac_ct_RANLIB PERLINTERP PERL_SHEBANG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PS FCFLAGS_F90 FCFLAGS_SRCEXT PREPDEFFLAG FCLIBS FC_FUNC FC_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES ZLIB_INC_DIR ZLIB_LIB_DIR ZLIB FFTW_INC_DIR FFTW_LIB_DIR FFTW_LIBS QHULL_INC_DIR QHULL_LIB_DIR QHULL USE_QHULL LIBOBJS POW_LIB CXXCPP __func__ MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI CGAL_CXXFLAGS CGAL_LDFLAGS CGAL_CPPFLAGS CGAL_LIBS USE_CGAL DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS LTLIBOBJS'
316   ac_subst_files=''
317  
318   # Initialize some variables set by options.
# Line 801 | Line 801 | if test "$ac_init_help" = "long"; then
801    # Omit some internal or obsolete options to make the list less imposing.
802    # This message is too long to be a string in the A/UX 3.1 sh.
803    cat <<_ACEOF
804 < \`configure' configures OOPSE 3.0 to adapt to many kinds of systems.
804 > \`configure' configures OOPSE 4.0 to adapt to many kinds of systems.
805  
806   Usage: $0 [OPTION]... [VAR=VALUE]...
807  
# Line 862 | Line 862 | if test -n "$ac_init_help"; then
862  
863   if test -n "$ac_init_help"; then
864    case $ac_init_help in
865 <     short | recursive ) echo "Configuration of OOPSE 3.0:";;
865 >     short | recursive ) echo "Configuration of OOPSE 4.0:";;
866     esac
867    cat <<\_ACEOF
868  
# Line 887 | Line 887 | Optional Packages:
887                            to /usr/local or /usr if not found in /usr/local)
888    --with-fftw=DIR         root directory path of fftw installation (defaults
889                            to /usr/local or /usr if not found in /usr/local)
890 +  --with-qhull=DIR        root directory path of qhull installation (defaults
891 +                          to /usr/local or /usr if not found in /usr/local)
892    --with-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
893 <  --with-cgal-makefile=FILE  CGAL makefile that should be used
893 >  --with-cgalmakefile=makefile
894 >                          Use the following CGAL makefile
895  
896   Some influential environment variables:
897    CXX         C++ compiler command
# Line 1003 | Line 1006 | if $ac_init_version; then
1006   test -n "$ac_init_help" && exit 0
1007   if $ac_init_version; then
1008    cat <<\_ACEOF
1009 < OOPSE configure 3.0
1009 > OOPSE configure 4.0
1010   generated by GNU Autoconf 2.59
1011  
1012   Copyright (C) 2003 Free Software Foundation, Inc.
# Line 1017 | Line 1020 | running configure, to aid debugging if configure makes
1020   This file contains any messages produced by compilers while
1021   running configure, to aid debugging if configure makes a mistake.
1022  
1023 < It was created by OOPSE $as_me 3.0, which was
1023 > It was created by OOPSE $as_me 4.0, which was
1024   generated by GNU Autoconf 2.59.  Invocation command line was
1025  
1026    $ $0 $@
# Line 1433 | Line 1436 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1436  
1437  
1438  
1439 +
1440 +
1441   # AC_F90_MODULE_NAMES
1442   # -------------------
1443   #
# Line 1527 | Line 1532 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1532  
1533  
1534  
1535 +
1536 +
1537 +
1538 +
1539 +
1540 +
1541 +
1542 +
1543 +
1544 +
1545 +
1546 +
1547 +
1548 +
1549 +
1550 +
1551 +
1552 +
1553 +
1554 +
1555 +
1556 + # This is taken from http://autoqt.sourceforge.net/
1557 + # Copyright (c) 2002, Geoffrey Wossum
1558 + # All rights reserved.
1559 +
1560 + # Redistribution and use in source and binary forms, with or without
1561 + # modification, are permitted provided that the following conditions are
1562 + # met:
1563 +
1564 + #  - Redistributions of source code must retain the above copyright notice,
1565 + #    this list of conditions and the following disclaimer.
1566 +
1567 + #  - Redistributions in binary form must reproduce the above copyright
1568 + #    notice, this list of conditions and the following disclaimer in the
1569 + #    documentation and/or other materials provided with the distribution.
1570 +
1571 + #  - Neither the name of Geoffrey Wossum nor the names of its
1572 + #    contributors may be used to endorse or promote products derived from
1573 + #    this software without specific prior written permission.
1574 +
1575 +
1576 + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1577 + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
1578 + # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1579 + # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
1580 + # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1581 + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1582 + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
1583 + # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
1584 + # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
1585 + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
1586 + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1587 +
1588 +
1589 + # Check for Qt compiler flags, linker flags, and binary packages
1590 +
1591 +
1592 +
1593   # who am i
1594   # Make sure we can run config.sub.
1595   $ac_config_sub sun4 >/dev/null 2>&1 ||
# Line 1655 | Line 1718 | if test -n "$ac_tool_prefix"; then
1718   ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1719   ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
1720   if test -n "$ac_tool_prefix"; then
1721 <  for ac_prog in $CCC icpc icc pgCC pathCC c++ xlc++ xlC g++ CC
1721 >  for ac_prog in $CCC mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC
1722    do
1723      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1724   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 1697 | Line 1760 | if test -z "$CXX"; then
1760   fi
1761   if test -z "$CXX"; then
1762    ac_ct_CXX=$CXX
1763 <  for ac_prog in $CCC icpc icc pgCC pathCC c++ xlc++ xlC g++ CC
1763 >  for ac_prog in $CCC mpicxx icpc pathCC pgCC c++ xlc++ xlC g++ CC
1764   do
1765    # Extract the first word of "$ac_prog", so it can be a program name with args.
1766   set dummy $ac_prog; ac_word=$2
# Line 2211 | Line 2274 | if test -n "$ac_tool_prefix"; then
2274   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2275   ac_compiler_gnu=$ac_cv_c_compiler_gnu
2276   if test -n "$ac_tool_prefix"; then
2277 <  for ac_prog in icc pgcc pathcc cc xlc gcc
2277 >  for ac_prog in mpicc icc pathcc pgcc cc xlc gcc
2278    do
2279      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2280   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2253 | Line 2316 | if test -z "$CC"; then
2316   fi
2317   if test -z "$CC"; then
2318    ac_ct_CC=$CC
2319 <  for ac_prog in icc pgcc pathcc cc xlc gcc
2319 >  for ac_prog in mpicc icc pathcc pgcc cc xlc gcc
2320   do
2321    # Extract the first word of "$ac_prog", so it can be a program name with args.
2322   set dummy $ac_prog; ac_word=$2
# Line 2722 | Line 2785 | if test -n "$ac_tool_prefix"; then
2785   ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $FCFLAGS_SRCEXT conftest.$ac_ext $LIBS >&5'
2786   ac_compiler_gnu=$ac_cv_fc_compiler_gnu
2787   if test -n "$ac_tool_prefix"; then
2788 <  for ac_prog in ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2788 >  for ac_prog in mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2789    do
2790      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
2791   set dummy $ac_tool_prefix$ac_prog; ac_word=$2
# Line 2764 | Line 2827 | if test -z "$FC"; then
2827   fi
2828   if test -z "$FC"; then
2829    ac_ct_FC=$FC
2830 <  for ac_prog in ifort ifc pgf95 pathf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2830 >  for ac_prog in mpif90 ifort ifc pathf95 pgf95 xlf95 lf95 epcf90 pathf90 xlf90 f95 f90 gfortran g95 fort
2831   do
2832    # Extract the first word of "$ac_prog", so it can be a program name with args.
2833   set dummy $ac_prog; ac_word=$2
# Line 2809 | Line 2872 | fi
2872  
2873  
2874   # Provide some information about the compiler.
2875 < echo "$as_me:2812:" \
2875 > echo "$as_me:2875:" \
2876       "checking for Fortran compiler version" >&5
2877   ac_compiler=`set X $ac_compile; echo $2`
2878   { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
# Line 4057 | Line 4120 | FCFLAGS="$FCFLAGS $ac_verb"
4120   # flags.
4121   ac_save_FFLAGS=$FCFLAGS
4122   FCFLAGS="$FCFLAGS $ac_verb"
4123 < (eval echo $as_me:4060: \"$ac_link\") >&5
4123 > (eval echo $as_me:4123: \"$ac_link\") >&5
4124   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4125   echo "$ac_fc_v_output" >&5
4126   FCFLAGS=$ac_save_FFLAGS
# Line 4135 | Line 4198 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4198   # flags.
4199   ac_save_FFLAGS=$FCFLAGS
4200   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4201 < (eval echo $as_me:4138: \"$ac_link\") >&5
4201 > (eval echo $as_me:4201: \"$ac_link\") >&5
4202   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4203   echo "$ac_fc_v_output" >&5
4204   FCFLAGS=$ac_save_FFLAGS
# Line 4871 | Line 4934 | FCFLAGS="$FCFLAGS $ac_verb"
4934   # flags.
4935   ac_save_FFLAGS=$FCFLAGS
4936   FCFLAGS="$FCFLAGS $ac_verb"
4937 < (eval echo $as_me:4874: \"$ac_link\") >&5
4937 > (eval echo $as_me:4937: \"$ac_link\") >&5
4938   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4939   echo "$ac_fc_v_output" >&5
4940   FCFLAGS=$ac_save_FFLAGS
# Line 4949 | Line 5012 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
5012   # flags.
5013   ac_save_FFLAGS=$FCFLAGS
5014   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
5015 < (eval echo $as_me:4952: \"$ac_link\") >&5
5015 > (eval echo $as_me:5015: \"$ac_link\") >&5
5016   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
5017   echo "$ac_fc_v_output" >&5
5018   FCFLAGS=$ac_save_FFLAGS
# Line 5843 | Line 5906 | echo "$as_me: WARNING: Sorry, $zlib_dir does not exist
5906    else
5907      { echo "$as_me:$LINENO: WARNING: Sorry, $zlib_dir does not exist, checking usual places" >&5
5908   echo "$as_me: WARNING: Sorry, $zlib_dir does not exist, checking usual places" >&2;}
5909 +        ZLIB_HOME=/usr/local
5910 +        if test ! -f "${ZLIB_HOME}/include/zlib.h"
5911 +        then
5912 +                ZLIB_HOME=/usr
5913 +        fi
5914    fi
5915   fi
5848 –
5849 – ZLIB_HOME=/usr/local
5850 – if test ! -f "${ZLIB_HOME}/include/zlib.h"
5851 – then
5852 –        ZLIB_HOME=/usr
5853 – fi
5854 –
5916   #
5917   # Locate zlib, if wanted
5918   #
5919   if test -n "${ZLIB_HOME}"
5920   then
5921          ZLIB_OLD_LDFLAGS=$LDFLAGS
5922 <        ZLIB_OLD_CPPFLAGS=$LDFLAGS
5922 >        ZLIB_OLD_CFLAGS=$CFLAGS
5923          LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
5924 <        CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
5924 >        CFLAGS="$CFLAGS -I${ZLIB_HOME}/include"
5925  
5926  
5927          ac_ext=c
# Line 6119 | Line 6180 | echo $ECHO_N "checking zlib in ${ZLIB_HOME}... $ECHO_C
6180                  ZLIB_LIB_DIR=
6181                  ZLIB=
6182                  LDFLAGS="$ZLIB_OLD_LDFLAGS"
6183 <                CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
6183 >                CFLAGS="$ZLIB_OLD_CFLAGS"
6184                  echo "$as_me:$LINENO: result: failed" >&5
6185   echo "${ECHO_T}failed" >&6
6186                  echo ""
# Line 6148 | Line 6209 | else
6209    withval="$with_fftw"
6210    fftw_dir="$withval"
6211   else
6212 <                fftw_dir="not_set"
6212 >             fftw_dir="not_set"
6213   fi;
6214   if test "$fftw_dir" != "no"; then
6215 <
6216 < if test "$fftw_dir" != "not_set" ; then
6217 <  if test -d "$fftw_dir"
6218 <  then
6219 <    FFTW_HOME="$fftw_dir"
6159 <  else
6160 <    { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
6215 >  if test "$fftw_dir" != "not_set" ; then
6216 >    if test -d "$fftw_dir"; then
6217 >      FFTW_HOME="$fftw_dir"
6218 >    else
6219 >      { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
6220   echo "$as_me: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&2;}
6221 <  fi
6222 < fi
6164 <
6165 < FFTW_HOME=/usr/local
6166 < if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"
6167 < then
6221 >      FFTW_HOME=/usr/local
6222 >      if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"; then
6223          FFTW_HOME=/usr
6224 < fi
6225 <
6226 < #
6227 < # Locate fftw, if wanted
6228 < #
6229 < if test -n "${FFTW_HOME}"
6230 < then
6231 <        FFTW_OLD_LDFLAGS=$LDFLAGS
6232 <        FFTW_OLD_CPPFLAGS=$LDFLAGS
6233 <        LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
6179 <        CPPFLAGS="$CPPFLAGS -I${FFTW_HOME}/include"
6224 >      fi
6225 >    fi
6226 >    #
6227 >    # Locate fftw, if wanted
6228 >    #
6229 >    if test -n "${FFTW_HOME}"; then
6230 >      FFTW_OLD_LDFLAGS=$LDFLAGS
6231 >      FFTW_OLD_CFLAGS=$CFLAGS
6232 >      LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
6233 >      CFLAGS="$CFLAGS -I${FFTW_HOME}/include"
6234  
6235  
6236 <        ac_ext=c
6236 >      ac_ext=c
6237   ac_cpp='$CPP $CPPFLAGS'
6238   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6239   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6240   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6241  
6242 <        echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
6242 >      echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
6243   echo $ECHO_N "checking for fftw_execute in -lfftw3... $ECHO_C" >&6
6244   if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then
6245    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6263 | Line 6317 | fi
6317    fftw_cv_libfftw3=no
6318   fi
6319  
6320 <        if test "${ac_cv_header_fftw3_h+set}" = set; then
6320 >      if test "${ac_cv_header_fftw3_h+set}" = set; then
6321    echo "$as_me:$LINENO: checking for fftw3.h" >&5
6322   echo $ECHO_N "checking for fftw3.h... $ECHO_C" >&6
6323   if test "${ac_cv_header_fftw3_h+set}" = set; then
# Line 6407 | Line 6461 | fi
6461   fi
6462  
6463  
6464 <        if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"
6465 <        then
6412 <                echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
6464 >      if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"; then
6465 >        echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
6466   echo $ECHO_N "checking for fftwnd_one in -lfftw... $ECHO_C" >&6
6467   if test "${ac_cv_lib_fftw_fftwnd_one+set}" = set; then
6468    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6487 | Line 6540 | fi
6540    fftw_cv_libfftw=no
6541   fi
6542  
6543 <                if test "${ac_cv_header_fftw_h+set}" = set; then
6543 >        if test "${ac_cv_header_fftw_h+set}" = set; then
6544    echo "$as_me:$LINENO: checking for fftw.h" >&5
6545   echo $ECHO_N "checking for fftw.h... $ECHO_C" >&6
6546   if test "${ac_cv_header_fftw_h+set}" = set; then
# Line 6631 | Line 6684 | fi
6684   fi
6685  
6686  
6687 <                if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"
6688 <                then
6636 <                        echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
6687 >        if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"; then
6688 >          echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
6689   echo $ECHO_N "checking for fftwnd_one in -ldfftw... $ECHO_C" >&6
6690   if test "${ac_cv_lib_dfftw_fftwnd_one+set}" = set; then
6691    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6711 | Line 6763 | fi
6763    fftw_cv_libdfftw=no
6764   fi
6765  
6766 <                        if test "${ac_cv_header_dfftw_h+set}" = set; then
6766 >          if test "${ac_cv_header_dfftw_h+set}" = set; then
6767    echo "$as_me:$LINENO: checking for dfftw.h" >&5
6768   echo $ECHO_N "checking for dfftw.h... $ECHO_C" >&6
6769   if test "${ac_cv_header_dfftw_h+set}" = set; then
# Line 6855 | Line 6907 | fi
6907   fi
6908  
6909  
6858 –                fi
6910          fi
6911 <        ac_ext=c
6911 >      fi
6912 >      ac_ext=c
6913   ac_cpp='$CPP $CPPFLAGS'
6914   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6915   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6916   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6917  
6918 +      if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"; then
6919  
6867 –        if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"
6868 –        then
6869 –
6920   cat >>confdefs.h <<\_ACEOF
6921   #define HAVE_FFTW3_H 1
6922   _ACEOF
6923  
6924 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6925 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6926 <                FFTW_LIBS="-lfftw3"
6927 <        else
6928 <        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"
6879 <        then
6924 >        FFTW_INC_DIR="${FFTW_HOME}/include"
6925 >        FFTW_LIB_DIR="${FFTW_HOME}/lib"
6926 >        FFTW_LIBS="-lfftw3"
6927 >      else
6928 >        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"; then
6929  
6930   cat >>confdefs.h <<\_ACEOF
6931   #define HAVE_FFTW_H 1
6932   _ACEOF
6933  
6934 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6935 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6936 <                FFTW_LIBS="-lfftw"
6934 >          FFTW_INC_DIR="${FFTW_HOME}/include"
6935 >          FFTW_LIB_DIR="${FFTW_HOME}/lib"
6936 >          FFTW_LIBS="-lfftw"
6937          else
6938 <        if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"
6890 <        then
6938 >          if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"; then
6939  
6940   cat >>confdefs.h <<\_ACEOF
6941   #define HAVE_DFFTW_H 1
6942   _ACEOF
6943  
6944 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6945 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6946 <                FFTW_LIBS="-ldfftw"
6947 <        else
6948 <                echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
6944 >            FFTW_INC_DIR="${FFTW_HOME}/include"
6945 >            FFTW_LIB_DIR="${FFTW_HOME}/lib"
6946 >            FFTW_LIBS="-ldfftw"
6947 >          else
6948 >            echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
6949   echo $ECHO_N "checking fftw in ${FFTW_HOME}... $ECHO_C" >&6
6950 <                FFTW_INC_DIR=
6951 <                FFTW_LIB_DIR=
6952 <                FFTW_LIBS=
6953 <                LDFLAGS="$FFTW_OLD_LDFLAGS"
6954 <                CPPFLAGS="$FFTW_OLD_CPPFLAGS"
6955 <                echo "$as_me:$LINENO: result: failed" >&5
6950 >            FFTW_INC_DIR=
6951 >            FFTW_LIB_DIR=
6952 >            FFTW_LIBS=
6953 >            LDFLAGS="$FFTW_OLD_LDFLAGS"
6954 >            CFLAGS="$FFTW_OLD_CFLAGS"
6955 >            echo "$as_me:$LINENO: result: failed" >&5
6956   echo "${ECHO_T}failed" >&6
6957 <        echo ""
6958 <        echo "*********************************************************"
6959 <        echo "* WARNING: Could not find a working FFTW installation   *"
6960 <        echo "* If you need the staticProps program to be able to     *"
6961 <        echo "* compute undulation spectra, be sure to specify a      *"
6962 <        echo "* valid fftw installation with --with-fftw=DIR          *"
6963 <        echo "*                                                       *"
6964 <        echo "* OOPSE will still work without fftw installed.         *"
6965 <        echo "*********************************************************"
6966 <        echo ""
6957 >            echo ""
6958 >            echo "*********************************************************"
6959 >            echo "* WARNING: Could not find a working FFTW installation   *"
6960 >            echo "* If you need the staticProps program to be able to     *"
6961 >            echo "* compute undulation spectra, be sure to specify a      *"
6962 >            echo "* valid fftw installation with --with-fftw=DIR          *"
6963 >            echo "*                                                       *"
6964 >            echo "* OOPSE will still work without fftw installed.         *"
6965 >            echo "*********************************************************"
6966 >            echo ""
6967 >          fi
6968          fi
6969 <        fi
6970 <        fi
6969 >      fi
6970 >
6971 >
6972 >
6973 >    fi
6974 >  fi
6975 > fi
6976 >
6977 > #
6978 > # Handle user hints
6979 > #
6980 >
6981 > # Check whether --with-qhull or --without-qhull was given.
6982 > if test "${with_qhull+set}" = set; then
6983 >  withval="$with_qhull"
6984 >  qhull_dir="$withval"
6985 > else
6986 >                qhull_dir="not_set"
6987 > fi;
6988 > if test "$qhull_dir" != "no"; then
6989 >
6990 > if test "$qhull_dir" != "not_set" ; then
6991 >  if test -d "$qhull_dir"
6992 >  then
6993 >    QHULL_HOME="$qhull_dir"
6994 >  else
6995 >    { echo "$as_me:$LINENO: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&5
6996 > echo "$as_me: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&2;}
6997 >        QHULL_HOME=/usr/local
6998 >        if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"
6999 >        then
7000 >                QHULL_HOME=/usr
7001 >        fi
7002 >  fi
7003 > fi
7004 > #
7005 > # Locate qhull, if wanted
7006 > #
7007 > if test -n "${QHULL_HOME}"
7008 > then
7009 >        QHULL_OLD_LDFLAGS=$LDFLAGS
7010 >        QHULL_OLD_CFLAGS=$CFLAGS
7011 >        LDFLAGS="$LDFLAGS -L${QHULL_HOME}/lib"
7012 >        CFLAGS="$CFLAGS -I${QHULL_HOME}/include"
7013 >
7014 >
7015 >        ac_ext=c
7016 > ac_cpp='$CPP $CPPFLAGS'
7017 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7018 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7019 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
7020 >
7021 >        echo "$as_me:$LINENO: checking for qh_qhull in -lqhull" >&5
7022 > echo $ECHO_N "checking for qh_qhull in -lqhull... $ECHO_C" >&6
7023 > if test "${ac_cv_lib_qhull_qh_qhull+set}" = set; then
7024 >  echo $ECHO_N "(cached) $ECHO_C" >&6
7025 > else
7026 >  ac_check_lib_save_LIBS=$LIBS
7027 > LIBS="-lqhull  $LIBS"
7028 > cat >conftest.$ac_ext <<_ACEOF
7029 > /* confdefs.h.  */
7030 > _ACEOF
7031 > cat confdefs.h >>conftest.$ac_ext
7032 > cat >>conftest.$ac_ext <<_ACEOF
7033 > /* end confdefs.h.  */
7034 >
7035 > /* Override any gcc2 internal prototype to avoid an error.  */
7036 > #ifdef __cplusplus
7037 > extern "C"
7038 > #endif
7039 > /* We use char because int might match the return type of a gcc2
7040 >   builtin and then its argument prototype would still apply.  */
7041 > char qh_qhull ();
7042 > #ifdef FC_DUMMY_MAIN
7043 > #ifndef FC_DUMMY_MAIN_EQ_F77
7044 > #  ifdef __cplusplus
7045 >     extern "C"
7046 > #  endif
7047 >   int FC_DUMMY_MAIN() { return 1; }
7048 > #endif
7049 > #endif
7050 > int
7051 > main ()
7052 > {
7053 > qh_qhull ();
7054 >  ;
7055 >  return 0;
7056 > }
7057 > _ACEOF
7058 > rm -f conftest.$ac_objext conftest$ac_exeext
7059 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7060 >  (eval $ac_link) 2>conftest.er1
7061 >  ac_status=$?
7062 >  grep -v '^ *+' conftest.er1 >conftest.err
7063 >  rm -f conftest.er1
7064 >  cat conftest.err >&5
7065 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7066 >  (exit $ac_status); } &&
7067 >         { ac_try='test -z "$ac_c_werror_flag"
7068 >                         || test ! -s conftest.err'
7069 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7070 >  (eval $ac_try) 2>&5
7071 >  ac_status=$?
7072 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7073 >  (exit $ac_status); }; } &&
7074 >         { ac_try='test -s conftest$ac_exeext'
7075 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7076 >  (eval $ac_try) 2>&5
7077 >  ac_status=$?
7078 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7079 >  (exit $ac_status); }; }; then
7080 >  ac_cv_lib_qhull_qh_qhull=yes
7081 > else
7082 >  echo "$as_me: failed program was:" >&5
7083 > sed 's/^/| /' conftest.$ac_ext >&5
7084  
7085 + ac_cv_lib_qhull_qh_qhull=no
7086 + fi
7087 + rm -f conftest.err conftest.$ac_objext \
7088 +      conftest$ac_exeext conftest.$ac_ext
7089 + LIBS=$ac_check_lib_save_LIBS
7090 + fi
7091 + echo "$as_me:$LINENO: result: $ac_cv_lib_qhull_qh_qhull" >&5
7092 + echo "${ECHO_T}$ac_cv_lib_qhull_qh_qhull" >&6
7093 + if test $ac_cv_lib_qhull_qh_qhull = yes; then
7094 +  qhull_cv_libqhull=yes
7095 + else
7096 +  qhull_cv_libqhull=no
7097 + fi
7098  
7099 +        if test "${ac_cv_header_qhull_qhull_h+set}" = set; then
7100 +  echo "$as_me:$LINENO: checking for qhull/qhull.h" >&5
7101 + echo $ECHO_N "checking for qhull/qhull.h... $ECHO_C" >&6
7102 + if test "${ac_cv_header_qhull_qhull_h+set}" = set; then
7103 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7104 + fi
7105 + echo "$as_me:$LINENO: result: $ac_cv_header_qhull_qhull_h" >&5
7106 + echo "${ECHO_T}$ac_cv_header_qhull_qhull_h" >&6
7107 + else
7108 +  # Is the header compilable?
7109 + echo "$as_me:$LINENO: checking qhull/qhull.h usability" >&5
7110 + echo $ECHO_N "checking qhull/qhull.h usability... $ECHO_C" >&6
7111 + cat >conftest.$ac_ext <<_ACEOF
7112 + /* confdefs.h.  */
7113 + _ACEOF
7114 + cat confdefs.h >>conftest.$ac_ext
7115 + cat >>conftest.$ac_ext <<_ACEOF
7116 + /* end confdefs.h.  */
7117 + $ac_includes_default
7118 + #include <qhull/qhull.h>
7119 + _ACEOF
7120 + rm -f conftest.$ac_objext
7121 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7122 +  (eval $ac_compile) 2>conftest.er1
7123 +  ac_status=$?
7124 +  grep -v '^ *+' conftest.er1 >conftest.err
7125 +  rm -f conftest.er1
7126 +  cat conftest.err >&5
7127 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7128 +  (exit $ac_status); } &&
7129 +         { ac_try='test -z "$ac_c_werror_flag"
7130 +                         || test ! -s conftest.err'
7131 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7132 +  (eval $ac_try) 2>&5
7133 +  ac_status=$?
7134 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7135 +  (exit $ac_status); }; } &&
7136 +         { ac_try='test -s conftest.$ac_objext'
7137 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7138 +  (eval $ac_try) 2>&5
7139 +  ac_status=$?
7140 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7141 +  (exit $ac_status); }; }; then
7142 +  ac_header_compiler=yes
7143 + else
7144 +  echo "$as_me: failed program was:" >&5
7145 + sed 's/^/| /' conftest.$ac_ext >&5
7146  
7147 + ac_header_compiler=no
7148   fi
7149 + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
7150 + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
7151 + echo "${ECHO_T}$ac_header_compiler" >&6
7152 +
7153 + # Is the header present?
7154 + echo "$as_me:$LINENO: checking qhull/qhull.h presence" >&5
7155 + echo $ECHO_N "checking qhull/qhull.h presence... $ECHO_C" >&6
7156 + cat >conftest.$ac_ext <<_ACEOF
7157 + /* confdefs.h.  */
7158 + _ACEOF
7159 + cat confdefs.h >>conftest.$ac_ext
7160 + cat >>conftest.$ac_ext <<_ACEOF
7161 + /* end confdefs.h.  */
7162 + #include <qhull/qhull.h>
7163 + _ACEOF
7164 + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7165 +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7166 +  ac_status=$?
7167 +  grep -v '^ *+' conftest.er1 >conftest.err
7168 +  rm -f conftest.er1
7169 +  cat conftest.err >&5
7170 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
7171 +  (exit $ac_status); } >/dev/null; then
7172 +  if test -s conftest.err; then
7173 +    ac_cpp_err=$ac_c_preproc_warn_flag
7174 +    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
7175 +  else
7176 +    ac_cpp_err=
7177 +  fi
7178 + else
7179 +  ac_cpp_err=yes
7180   fi
7181 + if test -z "$ac_cpp_err"; then
7182 +  ac_header_preproc=yes
7183 + else
7184 +  echo "$as_me: failed program was:" >&5
7185 + sed 's/^/| /' conftest.$ac_ext >&5
7186 +
7187 +  ac_header_preproc=no
7188 + fi
7189 + rm -f conftest.err conftest.$ac_ext
7190 + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
7191 + echo "${ECHO_T}$ac_header_preproc" >&6
7192 +
7193 + # So?  What about this header?
7194 + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
7195 +  yes:no: )
7196 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: accepted by the compiler, rejected by the preprocessor!" >&5
7197 + echo "$as_me: WARNING: qhull/qhull.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
7198 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: proceeding with the compiler's result" >&5
7199 + echo "$as_me: WARNING: qhull/qhull.h: proceeding with the compiler's result" >&2;}
7200 +    ac_header_preproc=yes
7201 +    ;;
7202 +  no:yes:* )
7203 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: present but cannot be compiled" >&5
7204 + echo "$as_me: WARNING: qhull/qhull.h: present but cannot be compiled" >&2;}
7205 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h:     check for missing prerequisite headers?" >&5
7206 + echo "$as_me: WARNING: qhull/qhull.h:     check for missing prerequisite headers?" >&2;}
7207 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: see the Autoconf documentation" >&5
7208 + echo "$as_me: WARNING: qhull/qhull.h: see the Autoconf documentation" >&2;}
7209 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h:     section \"Present But Cannot Be Compiled\"" >&5
7210 + echo "$as_me: WARNING: qhull/qhull.h:     section \"Present But Cannot Be Compiled\"" >&2;}
7211 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: proceeding with the preprocessor's result" >&5
7212 + echo "$as_me: WARNING: qhull/qhull.h: proceeding with the preprocessor's result" >&2;}
7213 +    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: in the future, the compiler will take precedence" >&5
7214 + echo "$as_me: WARNING: qhull/qhull.h: in the future, the compiler will take precedence" >&2;}
7215 +    (
7216 +      cat <<\_ASBOX
7217 + ## ------------------------------ ##
7218 + ## Report this to gezelter@nd.edu ##
7219 + ## ------------------------------ ##
7220 + _ASBOX
7221 +    ) |
7222 +      sed "s/^/$as_me: WARNING:     /" >&2
7223 +    ;;
7224 + esac
7225 + echo "$as_me:$LINENO: checking for qhull/qhull.h" >&5
7226 + echo $ECHO_N "checking for qhull/qhull.h... $ECHO_C" >&6
7227 + if test "${ac_cv_header_qhull_qhull_h+set}" = set; then
7228 +  echo $ECHO_N "(cached) $ECHO_C" >&6
7229 + else
7230 +  ac_cv_header_qhull_qhull_h=$ac_header_preproc
7231 + fi
7232 + echo "$as_me:$LINENO: result: $ac_cv_header_qhull_qhull_h" >&5
7233 + echo "${ECHO_T}$ac_cv_header_qhull_qhull_h" >&6
7234 +
7235 + fi
7236 + if test $ac_cv_header_qhull_qhull_h = yes; then
7237 +  qhull_cv_qhull_h=yes
7238 + else
7239 +  qhull_cv_qhull_h=no
7240 + fi
7241 +
7242 +
7243 +        ac_ext=c
7244 + ac_cpp='$CPP $CPPFLAGS'
7245 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7246 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7247 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
7248 +
7249 +
7250 +        if test "$qhull_cv_libqhull" = "yes" -a "$qhull_cv_qhull_h" = "yes"; then
7251 +
7252 + cat >>confdefs.h <<\_ACEOF
7253 + #define HAVE_QHULL_H 1
7254 + _ACEOF
7255 +
7256 +
7257 + cat >>confdefs.h <<\_ACEOF
7258 + #define HAVE_QHULL 1
7259 + _ACEOF
7260 +
7261 +                USE_QHULL=yes
7262 +                QHULL_INC_DIR="${QHULL_HOME}/include"
7263 +                QHULL_LIB_DIR="${QHULL_HOME}/lib"
7264 +                QHULL="-lqhull"
7265 +        else
7266 +                echo "$as_me:$LINENO: checking qhull in ${QHULL_HOME}" >&5
7267 + echo $ECHO_N "checking qhull in ${QHULL_HOME}... $ECHO_C" >&6
7268 +                QHULL_INC_DIR=
7269 +                QHULL_LIB_DIR=
7270 +                QHULL=
7271 +                USE_QHULL=no
7272 +                LDFLAGS="$QHULL_OLD_LDFLAGS"
7273 +                CFLAGS="$QHULL_OLD_CFLAGS"
7274 +                echo "$as_me:$LINENO: result: failed" >&5
7275 + echo "${ECHO_T}failed" >&6
7276 +                echo ""
7277 +                echo "*********************************************************"
7278 +                echo "* WARNING: Could not find a working qhull installation  *"
7279 +                echo "* If you need OOPSE to be able to deal with convex      *"
7280 +                echo "* hulls be sure to specify a valid qhull installation   *"
7281 +                echo "* with --with-qhull=DIR                                 *"
7282 +                echo "*                                                       *"
7283 +                echo "* OOPSE will still work without qhull installed.        *"
7284 +                echo "*********************************************************"
7285 +                echo ""
7286 +        fi
7287  
7288  
7289  
7290 +
7291 + fi
7292 + fi
7293 +
7294 +
7295   # Checks for header files.
7296   echo "$as_me:$LINENO: checking for ANSI C header files" >&5
7297   echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
# Line 11941 | Line 12306 | if test "$ac_test_FFLAGS" != "set"; then
12306    case "${host_cpu}-${host_os}" in
12307  
12308    *linux*) if test "$FC" = ifc -o "$FC" = ifort; then
12309 <                    FCFLAGS="-O3 -ip -no-prec-div -cxxlib-icc"
12309 >                    FCFLAGS="-O3 -ip -no-prec-div"
12310                  fi;;
12311     rs6000*-aix*)  if test "$FC" = xlf90 -o "$FC" = f90 -o "$FC" = xlf95; then
12312                      FCFLAGS="-O3 -qarch=pwrx -qtune=pwrx -qansialias -w"
# Line 12132 | Line 12497 | if test "$ac_test_CFLAGS" != "set"; then
12497  
12498    # use default flags for gcc on all systems
12499    if test $ac_cv_prog_really_gcc = yes; then
12500 <     CFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
12500 >     CFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align"
12501    fi
12502  
12503    # test for gcc-specific flags:
# Line 12589 | Line 12954 | if test "$ac_test_CXXFLAGS" != "set"; then
12954  
12955    # use default flags for gcc on all systems
12956    if test $ac_cv_prog_really_gxx = yes; then
12957 <     CXXFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
12957 >     CXXFLAGS="-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align"
12958    fi
12959  
12960    # test for gcc-specific flags:
# Line 12996 | Line 13361 | MPI_INC_DIR="$MPI/include"
13361   # Set variables...
13362   MPI_LIB_DIR="$MPI/lib"
13363   MPI_INC_DIR="$MPI/include"
13364 +
13365  
13366  
13367 + ac_ext=c
13368 + ac_cpp='$CPP $CPPFLAGS'
13369 + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13370 + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13371 + ac_compiler_gnu=$ac_cv_c_compiler_gnu
13372  
13373   echo "$as_me:$LINENO: checking for mpi.h" >&5
13374   echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6
13375   have_mpi_h=0
13376   rm -f conftest*
13377 < echo '#include <mpi.h>' > conftest.cc
13378 < if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then
13377 > echo '#include <mpi.h>' > conftest.c
13378 > if ${CC} -I${MPI_INC_DIR} -c conftest.c 2>&1 ; then
13379          echo "$as_me:$LINENO: result: yes" >&5
13380   echo "${ECHO_T}yes" >&6
13381          have_mpi_h=1
# Line 13068 | Line 13439 | ac_ext=$ac_save_ext
13439   fi
13440   FCFLAGS=$ac_save_FCFLAGS
13441   ac_ext=$ac_save_ext
13442 < ac_ext=cc
13443 < ac_cpp='$CXXCPP $CPPFLAGS'
13444 < ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13445 < ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13446 < ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13442 > ac_ext=c
13443 > ac_cpp='$CPP $CPPFLAGS'
13444 > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13445 > ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13446 > ac_compiler_gnu=$ac_cv_c_compiler_gnu
13447  
13448  
13449   ac_ext=c
# Line 13164 | Line 13535 | if test x = x"$MPI_LIB"; then
13535   fi
13536   $as_unset ac_cv_lib_mpich_MPI_Init
13537   if test x = x"$MPI_LIB"; then
13538 <        echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
13539 < echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6
13540 < if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
13538 >        echo "$as_me:$LINENO: checking for MPI_Init in -lpmpich" >&5
13539 > echo $ECHO_N "checking for MPI_Init in -lpmpich... $ECHO_C" >&6
13540 > if test "${ac_cv_lib_pmpich_MPI_Init+set}" = set; then
13541    echo $ECHO_N "(cached) $ECHO_C" >&6
13542   else
13543    ac_check_lib_save_LIBS=$LIBS
13544 < LIBS="-lmpich "-lpmpich" $LIBS"
13544 > LIBS="-lpmpich -lmpich -lpmpich -lmpich $LIBS"
13545   cat >conftest.$ac_ext <<_ACEOF
13546   /* confdefs.h.  */
13547   _ACEOF
# Line 13223 | Line 13594 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13594    ac_status=$?
13595    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13596    (exit $ac_status); }; }; then
13597 <  ac_cv_lib_mpich_MPI_Init=yes
13597 >  ac_cv_lib_pmpich_MPI_Init=yes
13598   else
13599    echo "$as_me: failed program was:" >&5
13600   sed 's/^/| /' conftest.$ac_ext >&5
13601  
13602 < ac_cv_lib_mpich_MPI_Init=no
13602 > ac_cv_lib_pmpich_MPI_Init=no
13603   fi
13604   rm -f conftest.err conftest.$ac_objext \
13605        conftest$ac_exeext conftest.$ac_ext
13606   LIBS=$ac_check_lib_save_LIBS
13607   fi
13608 < echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
13609 < echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6
13610 < if test $ac_cv_lib_mpich_MPI_Init = yes; then
13611 <  MPI_LIB="-lpmpich -lmpich"
13608 > echo "$as_me:$LINENO: result: $ac_cv_lib_pmpich_MPI_Init" >&5
13609 > echo "${ECHO_T}$ac_cv_lib_pmpich_MPI_Init" >&6
13610 > if test $ac_cv_lib_pmpich_MPI_Init = yes; then
13611 >  MPI_LIB="-lpmpich -lmpich -lpmpich -lmpich"
13612   fi
13613  
13614   fi
# Line 13327 | Line 13698 | else
13698    echo $ECHO_N "(cached) $ECHO_C" >&6
13699   else
13700    ac_check_lib_save_LIBS=$LIBS
13701 < LIBS="-lmpi "-llam" $LIBS"
13701 > LIBS="-lmpi -llam $LIBS"
13702   cat >conftest.$ac_ext <<_ACEOF
13703   /* confdefs.h.  */
13704   _ACEOF
# Line 13505 | Line 13876 | fi
13876  
13877  
13878  
13879 < USE_CGAL=no
13509 < cgal_makefile=auto
13879 > acx_cgal_found=no
13880  
13881 < # Check whether --with-cgal-makefile or --without-cgal-makefile was given.
13882 < if test "${with_cgal_makefile+set}" = set; then
13883 <  withval="$with_cgal_makefile"
13514 <  cgal_makefile="$withval"
13515 < fi;
13881 > # Check whether --with-cgalmakefile or --without-cgalmakefile was given.
13882 > if test "${with_cgalmakefile+set}" = set; then
13883 >  withval="$with_cgalmakefile"
13884  
13885 < if test "x$cgal_makefile" != xno; then
13885 > fi;
13886 > case $with_cgalmakefile in
13887 >        yes | "") ;;
13888 >        no) acx_cgal_found=disable ;;
13889 >        -* | */* | *.a | *.so | *.so.* | *.o) CGAL_MAKEFILE="$with_cgalmakefile" ;;
13890 >        *) CGAL_MAKEFILE="$with_cgalmakefile" ;;
13891 > esac
13892  
13893 <  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
13894 <    cgal_makefile="$CGAL_MAKEFILE"
13895 <  fi
13893 > if test "$acx_cgal_found" == no; then
13894 >    echo "$as_me:$LINENO: checking CGAL_MAKEFILE" >&5
13895 > echo $ECHO_N "checking CGAL_MAKEFILE... $ECHO_C" >&6
13896  
13897 <  echo "$as_me:$LINENO: checking for cgal_makefile: $cgal_makefile" >&5
13524 < echo $ECHO_N "checking for cgal_makefile: $cgal_makefile... $ECHO_C" >&6
13897 >    if test \! -z "$CGAL_MAKEFILE"; then
13898  
13899 <  if test -f "$cgal_makefile"; then
13899 >        if test -e "$CGAL_MAKEFILE"; then
13900 >            tname=`mktemp /tmp/cgal_makefile_dsrXXXXXX`
13901  
13902 <    cat >config.tmp.Makefile <<EOF
13903 < include $cgal_makefile
13530 < default:
13531 <        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
13532 <        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
13533 <        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
13534 <        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
13535 <        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
13536 <        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
13537 <        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
13538 <        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
13539 <        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
13540 <        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
13541 <        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
13542 <        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
13543 < EOF
13902 > cat > $tname << _ACEOF
13903 > include $CGAL_MAKEFILE
13904  
13905 <    make -s -f config.tmp.Makefile
13906 <    . config.tmp.cgalvariables
13905 > cppflags:
13906 >        @echo \$(CGAL_CXXFLAGS)
13907  
13908 <    rm -f config.tmp.Makefile config.tmp.cgalvariables
13909 <
13910 <    if test "x$CGAL_INCLDIR" = "x"; then
13911 <      CGAL_INCLDIR=""
13912 <    fi
13913 <
13914 <    if test "x$CGAL_LIBDIR" = "x"; then
13915 <      CGAL_LIBDIR=""
13916 <    fi
13917 <
13918 <    if test "x$CGAL_RLIBDIR" = "x"; then
13919 <      CGAL_RLIBDIR=""
13920 <    fi
13921 <
13922 <    if test "x$LEDA_INCLDIR" = "x"; then
13923 <      LEDA_INCLDIR=""
13924 <    fi
13925 <
13926 <    if test "x$LEDA_LIBDIR" = "x"; then
13927 <      LEDA_LIBDIR=""
13928 <    fi
13929 <
13930 <    if test "x$LEDA_RLIBDIR" = "x"; then
13931 <      LEDA_RLIBDIR=""
13932 <    fi
13933 <
13934 <    if test "x$GMP_INCLDIR" = "x"; then
13935 <      GMP_INCLDIR=""
13936 <    fi
13577 <
13578 <    if test "x$GMP_LIBDIR" = "x"; then
13579 <      GMP_LIBDIR=""
13580 <    fi
13581 <
13582 <    if test "x$GMP_RLIBDIR" = "x"; then
13583 <      GMP_RLIBDIR=""
13908 > cxxflags:
13909 >        @echo
13910 > ldflags:
13911 >        @echo \$(CGAL_LDFLAGS)
13912 > _ACEOF
13913 >            CGAL_CPPFLAGS="`make -s -f $tname cppflags`"
13914 >            CGAL_CXXFLAGS="`make -s -f $tname cxxflags`"
13915 >            CGAL_LDFLAGST="`make -s -f $tname ldflags`"
13916 >            for i in $CGAL_LDFLAGST; do
13917 >                if test `echo $i| grep -c ^-l`; then
13918 >                    CGAL_LIBS="$CGAL_LIBS $i"
13919 >                else
13920 >                    CGAL_LDFLAGS="$CGAL_LDFLAGS $i"
13921 >                fi
13922 >            done
13923 >            rm -f $tname
13924 >            echo "$as_me:$LINENO: result: yes" >&5
13925 > echo "${ECHO_T}yes" >&6
13926 >            acx_cgal_found=yes
13927 >                                   else
13928 >            echo "$as_me:$LINENO: result: invalid" >&5
13929 > echo "${ECHO_T}invalid" >&6
13930 >            { { echo "$as_me:$LINENO: error: CGAL_MAKEFILE defined, but the makefile does not exist." >&5
13931 > echo "$as_me: error: CGAL_MAKEFILE defined, but the makefile does not exist." >&2;}
13932 >   { (exit 1); exit 1; }; }
13933 >        fi
13934 >    else
13935 >        echo "$as_me:$LINENO: result: not defined" >&5
13936 > echo "${ECHO_T}not defined" >&6
13937      fi
13938 + fi
13939  
13940 <    echo "$as_me:$LINENO: result: CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&5
13941 < echo "${ECHO_T}CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&6
13942 <    echo "$as_me:$LINENO: result: CGAL_INCLDIR=       $CGAL_INCLDIR" >&5
13943 < echo "${ECHO_T}CGAL_INCLDIR=       $CGAL_INCLDIR" >&6
13944 <    echo "$as_me:$LINENO: result: CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&5
13591 < echo "${ECHO_T}CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&6
13592 <    echo "$as_me:$LINENO: result: CGAL_LIBDIR=        $CGAL_LIBDIR" >&5
13593 < echo "${ECHO_T}CGAL_LIBDIR=        $CGAL_LIBDIR" >&6
13594 <    echo "$as_me:$LINENO: result: CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&5
13595 < echo "${ECHO_T}CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&6
13596 <    echo "$as_me:$LINENO: result: LEDA_INCLDIR=       $LEDA_INCLDIR" >&5
13597 < echo "${ECHO_T}LEDA_INCLDIR=       $LEDA_INCLDIR" >&6
13598 <    echo "$as_me:$LINENO: result: LEDA_LIBDIR=        $LEDA_LIBDIR" >&5
13599 < echo "${ECHO_T}LEDA_LIBDIR=        $LEDA_LIBDIR" >&6
13600 <    echo "$as_me:$LINENO: result: GMP_INCLDIR=        $GMP_INCLDIR" >&5
13601 < echo "${ECHO_T}GMP_INCLDIR=        $GMP_INCLDIR" >&6
13602 <    echo "$as_me:$LINENO: result: GMP_LIBDIR=         $GMP_LIBDIR" >&5
13603 < echo "${ECHO_T}GMP_LIBDIR=         $GMP_LIBDIR" >&6
13604 <
13605 <    ac_ext=cc
13606 < ac_cpp='$CXXCPP $CPPFLAGS'
13607 < ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13608 < ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13609 < ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13610 <
13611 <    save_CXXFLAGS="$CXXFLAGS"
13612 <    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13613 <    if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13614 <  echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
13615 < echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
13616 < if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13940 > if test "$acx_cgal_found" == no; then
13941 >        if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
13942 >  echo "$as_me:$LINENO: checking for CGAL/Exact_predicates_inexact_constructions_kernel.h" >&5
13943 > echo $ECHO_N "checking for CGAL/Exact_predicates_inexact_constructions_kernel.h... $ECHO_C" >&6
13944 > if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
13945    echo $ECHO_N "(cached) $ECHO_C" >&6
13946   fi
13947 < echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
13948 < echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
13947 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&5
13948 > echo "${ECHO_T}$ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&6
13949   else
13950    # Is the header compilable?
13951 < echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5
13952 < echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6
13951 > echo "$as_me:$LINENO: checking CGAL/Exact_predicates_inexact_constructions_kernel.h usability" >&5
13952 > echo $ECHO_N "checking CGAL/Exact_predicates_inexact_constructions_kernel.h usability... $ECHO_C" >&6
13953   cat >conftest.$ac_ext <<_ACEOF
13954   /* confdefs.h.  */
13955   _ACEOF
# Line 13629 | Line 13957 | $ac_includes_default
13957   cat >>conftest.$ac_ext <<_ACEOF
13958   /* end confdefs.h.  */
13959   $ac_includes_default
13960 < #include <CGAL/Cartesian.h>
13960 > #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
13961   _ACEOF
13962   rm -f conftest.$ac_objext
13963   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
# Line 13640 | Line 13968 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13968    cat conftest.err >&5
13969    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13970    (exit $ac_status); } &&
13971 <         { ac_try='test -z "$ac_cxx_werror_flag"
13971 >         { ac_try='test -z "$ac_c_werror_flag"
13972                           || test ! -s conftest.err'
13973    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13974    (eval $ac_try) 2>&5
# Line 13665 | Line 13993 | echo "${ECHO_T}$ac_header_compiler" >&6
13993   echo "${ECHO_T}$ac_header_compiler" >&6
13994  
13995   # Is the header present?
13996 < echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5
13997 < echo $ECHO_N "checking CGAL/Cartesian.h presence... $ECHO_C" >&6
13996 > echo "$as_me:$LINENO: checking CGAL/Exact_predicates_inexact_constructions_kernel.h presence" >&5
13997 > echo $ECHO_N "checking CGAL/Exact_predicates_inexact_constructions_kernel.h presence... $ECHO_C" >&6
13998   cat >conftest.$ac_ext <<_ACEOF
13999   /* confdefs.h.  */
14000   _ACEOF
14001   cat confdefs.h >>conftest.$ac_ext
14002   cat >>conftest.$ac_ext <<_ACEOF
14003   /* end confdefs.h.  */
14004 < #include <CGAL/Cartesian.h>
14004 > #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
14005   _ACEOF
14006   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
14007    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 13684 | Line 14012 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
14012    echo "$as_me:$LINENO: \$? = $ac_status" >&5
14013    (exit $ac_status); } >/dev/null; then
14014    if test -s conftest.err; then
14015 <    ac_cpp_err=$ac_cxx_preproc_warn_flag
14016 <    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
14015 >    ac_cpp_err=$ac_c_preproc_warn_flag
14016 >    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
14017    else
14018      ac_cpp_err=
14019    fi
# Line 13705 | Line 14033 | echo "${ECHO_T}$ac_header_preproc" >&6
14033   echo "${ECHO_T}$ac_header_preproc" >&6
14034  
14035   # So?  What about this header?
14036 < case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
14036 > case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
14037    yes:no: )
14038 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&5
14039 < echo "$as_me: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
14040 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&5
14041 < echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&2;}
14038 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: accepted by the compiler, rejected by the preprocessor!" >&5
14039 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
14040 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the compiler's result" >&5
14041 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the compiler's result" >&2;}
14042      ac_header_preproc=yes
14043      ;;
14044    no:yes:* )
14045 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&5
14046 < echo "$as_me: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&2;}
14047 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&5
14048 < echo "$as_me: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&2;}
14049 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&5
14050 < echo "$as_me: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&2;}
14051 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&5
14052 < echo "$as_me: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
14053 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&5
14054 < echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&2;}
14055 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&5
14056 < echo "$as_me: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&2;}
14045 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: present but cannot be compiled" >&5
14046 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: present but cannot be compiled" >&2;}
14047 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     check for missing prerequisite headers?" >&5
14048 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     check for missing prerequisite headers?" >&2;}
14049 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: see the Autoconf documentation" >&5
14050 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: see the Autoconf documentation" >&2;}
14051 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     section \"Present But Cannot Be Compiled\"" >&5
14052 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
14053 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the preprocessor's result" >&5
14054 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the preprocessor's result" >&2;}
14055 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: in the future, the compiler will take precedence" >&5
14056 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: in the future, the compiler will take precedence" >&2;}
14057      (
14058        cat <<\_ASBOX
14059   ## ------------------------------ ##
# Line 13736 | Line 14064 | esac
14064        sed "s/^/$as_me: WARNING:     /" >&2
14065      ;;
14066   esac
14067 < echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
14068 < echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
14069 < if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
14067 > echo "$as_me:$LINENO: checking for CGAL/Exact_predicates_inexact_constructions_kernel.h" >&5
14068 > echo $ECHO_N "checking for CGAL/Exact_predicates_inexact_constructions_kernel.h... $ECHO_C" >&6
14069 > if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
14070    echo $ECHO_N "(cached) $ECHO_C" >&6
14071   else
14072 <  ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc
14072 >  ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h=$ac_header_preproc
14073   fi
14074 < echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
14075 < echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
14074 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&5
14075 > echo "${ECHO_T}$ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&6
14076  
14077   fi
14078 < if test $ac_cv_header_CGAL_Cartesian_h = yes; then
14079 <  cgal=yes
14078 > if test $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h = yes; then
14079 >  cgal_have_header=yes
14080   else
14081 <  cgal=no
14081 >  cgal_have_header=no
14082   fi
14083  
14084  
14085 <    CXXFLAGS="$save_CXXFLAGS"
14085 >        if test "$cgal_have_header" == yes; then
14086 >                echo "$as_me:$LINENO: checking for main in -lCGAL" >&5
14087 > echo $ECHO_N "checking for main in -lCGAL... $ECHO_C" >&6
14088 > if test "${ac_cv_lib_CGAL_main+set}" = set; then
14089 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14090 > else
14091 >  ac_check_lib_save_LIBS=$LIBS
14092 > LIBS="-lCGAL  $LIBS"
14093 > cat >conftest.$ac_ext <<_ACEOF
14094 > /* confdefs.h.  */
14095 > _ACEOF
14096 > cat confdefs.h >>conftest.$ac_ext
14097 > cat >>conftest.$ac_ext <<_ACEOF
14098 > /* end confdefs.h.  */
14099  
13759 –    if test "x$cgal" = xyes; then
13760 –      echo "$as_me:$LINENO: checking for CGAL version" >&5
13761 – echo $ECHO_N "checking for CGAL version... $ECHO_C" >&6
13762 –      LOCATION=${CGAL_INCLDIR}
13763 –      LOCATION=${LOCATION:-/usr/include}
13764 –      if test -f $LOCATION/CGAL/version.h; then
13765 –        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
13766 –      else
13767 –        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
13768 –      fi
13769 –      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
13770 –        echo "$as_me:$LINENO: result: ($CGAL_VERSION) yes" >&5
13771 – echo "${ECHO_T}($CGAL_VERSION) yes" >&6
13772 –      else
13773 –        echo "$as_me:$LINENO: result: ($CGAL_VERSION) no" >&5
13774 – echo "${ECHO_T}($CGAL_VERSION) no" >&6
13775 –        cgal=no
13776 –      fi
13777 –    fi
14100  
14101 <    if test "x$cgal" = xyes; then
14102 <      CGAL_LIBS="-lCGAL"
14103 <      echo "$as_me:$LINENO: checking whether CGAL uses LEDA" >&5
14104 < echo $ECHO_N "checking whether CGAL uses LEDA... $ECHO_C" >&6
14105 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
14106 <        CGAL_USES_LEDA=yes
14107 <        echo "$as_me:$LINENO: result: yes" >&5
14108 < echo "${ECHO_T}yes" >&6
14109 <        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
14110 <      else
14111 <        echo "$as_me:$LINENO: result: no" >&5
14112 < echo "${ECHO_T}no" >&6
14113 <        CGAL_USES_LEDA=no
14114 <      fi
14101 > #ifdef FC_DUMMY_MAIN
14102 > #ifndef FC_DUMMY_MAIN_EQ_F77
14103 > #  ifdef __cplusplus
14104 >     extern "C"
14105 > #  endif
14106 >   int FC_DUMMY_MAIN() { return 1; }
14107 > #endif
14108 > #endif
14109 > int
14110 > main ()
14111 > {
14112 > main ();
14113 >  ;
14114 >  return 0;
14115 > }
14116 > _ACEOF
14117 > rm -f conftest.$ac_objext conftest$ac_exeext
14118 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14119 >  (eval $ac_link) 2>conftest.er1
14120 >  ac_status=$?
14121 >  grep -v '^ *+' conftest.er1 >conftest.err
14122 >  rm -f conftest.er1
14123 >  cat conftest.err >&5
14124 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14125 >  (exit $ac_status); } &&
14126 >         { ac_try='test -z "$ac_c_werror_flag"
14127 >                         || test ! -s conftest.err'
14128 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14129 >  (eval $ac_try) 2>&5
14130 >  ac_status=$?
14131 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14132 >  (exit $ac_status); }; } &&
14133 >         { ac_try='test -s conftest$ac_exeext'
14134 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14135 >  (eval $ac_try) 2>&5
14136 >  ac_status=$?
14137 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14138 >  (exit $ac_status); }; }; then
14139 >  ac_cv_lib_CGAL_main=yes
14140 > else
14141 >  echo "$as_me: failed program was:" >&5
14142 > sed 's/^/| /' conftest.$ac_ext >&5
14143  
14144 <      echo "$as_me:$LINENO: checking whether CGAL uses GMP" >&5
14145 < echo $ECHO_N "checking whether CGAL uses GMP... $ECHO_C" >&6
14146 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
14147 <        CGAL_USES_GMP=yes
14148 <        echo "$as_me:$LINENO: result: yes" >&5
14149 < echo "${ECHO_T}yes" >&6
14150 <        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
14151 <      else
14152 <        echo "$as_me:$LINENO: result: no" >&5
14153 < echo "${ECHO_T}no" >&6
14154 <        CGAL_USES_GMP=no
14155 <      fi
14144 > ac_cv_lib_CGAL_main=no
14145 > fi
14146 > rm -f conftest.err conftest.$ac_objext \
14147 >      conftest$ac_exeext conftest.$ac_ext
14148 > LIBS=$ac_check_lib_save_LIBS
14149 > fi
14150 > echo "$as_me:$LINENO: result: $ac_cv_lib_CGAL_main" >&5
14151 > echo "${ECHO_T}$ac_cv_lib_CGAL_main" >&6
14152 > if test $ac_cv_lib_CGAL_main = yes; then
14153 >  cgal_have_lib=yes
14154 > else
14155 >  cgal_have_lib=no
14156 > fi
14157  
14158 <      CGAL_LIBS="$CGAL_LIBS -lm"
14159 <
14160 <      CGAL_CXXFLAGS="-ftemplate-depth-50"
14161 <
14162 <      echo "$as_me:$LINENO: result: CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&5
14163 < echo "${ECHO_T}CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&6
14164 <      echo "$as_me:$LINENO: result: CGAL_USES_GMP =     $CGAL_USES_GMP" >&5
14165 < echo "${ECHO_T}CGAL_USES_GMP =     $CGAL_USES_GMP" >&6
13815 <      echo "$as_me:$LINENO: result: CGAL_INCLDIR  =     $CGAL_INCLDIR" >&5
13816 < echo "${ECHO_T}CGAL_INCLDIR  =     $CGAL_INCLDIR" >&6
13817 <      echo "$as_me:$LINENO: result: CGAL_LIBDIR   =     $CGAL_LIBDIR" >&5
13818 < echo "${ECHO_T}CGAL_LIBDIR   =     $CGAL_LIBDIR" >&6
13819 <      echo "$as_me:$LINENO: result: CGAL_DEFINES  =     $CGAL_DEFINES" >&5
13820 < echo "${ECHO_T}CGAL_DEFINES  =     $CGAL_DEFINES" >&6
13821 <      echo "$as_me:$LINENO: result: CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&5
13822 < echo "${ECHO_T}CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&6
13823 <      echo "$as_me:$LINENO: result: CGAL_LIBS     =     $CGAL_LIBS" >&5
13824 < echo "${ECHO_T}CGAL_LIBS     =     $CGAL_LIBS" >&6
13825 <    fi
13826 <
13827 <    if test "x$cgal" = xyes; then
13828 <      save_LIBS="$LIBS"
13829 <      LIBS="$LIBS -L$CGAL_LIBDIR"
13830 <      if test "x$CGAL_USES_LEDA" = xyes; then
13831 <        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
13832 <      fi
13833 <      # if test "x$CGAL_USES_GMP" = xyes; then
13834 <      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
13835 <      # fi
13836 <      echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
13837 < echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
13838 < save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
13839 < CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13840 < save_LIBS_CHECK_CXX_LIB="$LIBS"
14158 >                if test "$cgal_have_lib" == no; then
14159 >                        save_LIBS="$LIBS"; LIBS="$LIBS -lgmp -lmpfr -lm"
14160 >                        echo "$as_me:$LINENO: checking for main in -lCGAL" >&5
14161 > echo $ECHO_N "checking for main in -lCGAL... $ECHO_C" >&6
14162 > if test "${ac_cv_lib_CGAL_main+set}" = set; then
14163 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14164 > else
14165 >  ac_check_lib_save_LIBS=$LIBS
14166   LIBS="-lCGAL  $LIBS"
14167   cat >conftest.$ac_ext <<_ACEOF
14168   /* confdefs.h.  */
# Line 13845 | Line 14170 | cat >>conftest.$ac_ext <<_ACEOF
14170   cat confdefs.h >>conftest.$ac_ext
14171   cat >>conftest.$ac_ext <<_ACEOF
14172   /* end confdefs.h.  */
14173 < #include <CGAL/Cartesian.h>
14173 >
14174 >
14175   #ifdef FC_DUMMY_MAIN
14176   #ifndef FC_DUMMY_MAIN_EQ_F77
14177   #  ifdef __cplusplus
# Line 13857 | Line 14183 | main ()
14183   int
14184   main ()
14185   {
14186 < ::CGAL::Cartesian<int>::Point_2 P
14186 > main ();
14187    ;
14188    return 0;
14189   }
# Line 13871 | Line 14197 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14197    cat conftest.err >&5
14198    echo "$as_me:$LINENO: \$? = $ac_status" >&5
14199    (exit $ac_status); } &&
14200 <         { ac_try='test -z "$ac_cxx_werror_flag"
14200 >         { ac_try='test -z "$ac_c_werror_flag"
14201                           || test ! -s conftest.err'
14202    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14203    (eval $ac_try) 2>&5
# Line 13884 | Line 14210 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14210    ac_status=$?
14211    echo "$as_me:$LINENO: \$? = $ac_status" >&5
14212    (exit $ac_status); }; }; then
14213 <  echo "$as_me:$LINENO: result: yes" >&5
13888 < echo "${ECHO_T}yes" >&6
13889 < cgal=yes
14213 >  ac_cv_lib_CGAL_main=yes
14214   else
14215    echo "$as_me: failed program was:" >&5
14216   sed 's/^/| /' conftest.$ac_ext >&5
14217  
14218 < echo "$as_me:$LINENO: result: no" >&5
13895 < echo "${ECHO_T}no" >&6
13896 < cgal=no
14218 > ac_cv_lib_CGAL_main=no
14219   fi
14220   rm -f conftest.err conftest.$ac_objext \
14221        conftest$ac_exeext conftest.$ac_ext
14222 < CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB"
14223 < LIBS="$save_LIBS_CHECK_CXX_LIB"
14224 <      LIBS="$save_LIBS"
14225 <    fi
14222 > LIBS=$ac_check_lib_save_LIBS
14223 > fi
14224 > echo "$as_me:$LINENO: result: $ac_cv_lib_CGAL_main" >&5
14225 > echo "${ECHO_T}$ac_cv_lib_CGAL_main" >&6
14226 > if test $ac_cv_lib_CGAL_main = yes; then
14227 >  CGAL_LIBS="-lCGAL -lgmp -lmpfr"
14228 >                                                  cgal_have_lib=yes
14229 > else
14230 >  cgal_have_lib=no
14231 > fi
14232  
14233 <  fi
14234 <  ac_ext=c
14235 < ac_cpp='$CPP $CPPFLAGS'
14236 < ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
14237 < ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
14238 < ac_compiler_gnu=$ac_cv_c_compiler_gnu
14233 >                        LIBS="$save_LIBS"
14234 >                else
14235 >                        CGAL_LIBS="-lCGAL"
14236 >                        echo "$as_me:$LINENO: checking for main in -lmpfr" >&5
14237 > echo $ECHO_N "checking for main in -lmpfr... $ECHO_C" >&6
14238 > if test "${ac_cv_lib_mpfr_main+set}" = set; then
14239 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14240 > else
14241 >  ac_check_lib_save_LIBS=$LIBS
14242 > LIBS="-lmpfr  $LIBS"
14243 > cat >conftest.$ac_ext <<_ACEOF
14244 > /* confdefs.h.  */
14245 > _ACEOF
14246 > cat confdefs.h >>conftest.$ac_ext
14247 > cat >>conftest.$ac_ext <<_ACEOF
14248 > /* end confdefs.h.  */
14249  
14250  
14251 + #ifdef FC_DUMMY_MAIN
14252 + #ifndef FC_DUMMY_MAIN_EQ_F77
14253 + #  ifdef __cplusplus
14254 +     extern "C"
14255 + #  endif
14256 +   int FC_DUMMY_MAIN() { return 1; }
14257 + #endif
14258 + #endif
14259 + int
14260 + main ()
14261 + {
14262 + main ();
14263 +  ;
14264 +  return 0;
14265 + }
14266 + _ACEOF
14267 + rm -f conftest.$ac_objext conftest$ac_exeext
14268 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14269 +  (eval $ac_link) 2>conftest.er1
14270 +  ac_status=$?
14271 +  grep -v '^ *+' conftest.er1 >conftest.err
14272 +  rm -f conftest.er1
14273 +  cat conftest.err >&5
14274 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14275 +  (exit $ac_status); } &&
14276 +         { ac_try='test -z "$ac_c_werror_flag"
14277 +                         || test ! -s conftest.err'
14278 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14279 +  (eval $ac_try) 2>&5
14280 +  ac_status=$?
14281 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14282 +  (exit $ac_status); }; } &&
14283 +         { ac_try='test -s conftest$ac_exeext'
14284 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14285 +  (eval $ac_try) 2>&5
14286 +  ac_status=$?
14287 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14288 +  (exit $ac_status); }; }; then
14289 +  ac_cv_lib_mpfr_main=yes
14290 + else
14291 +  echo "$as_me: failed program was:" >&5
14292 + sed 's/^/| /' conftest.$ac_ext >&5
14293 +
14294 + ac_cv_lib_mpfr_main=no
14295   fi
14296 + rm -f conftest.err conftest.$ac_objext \
14297 +      conftest$ac_exeext conftest.$ac_ext
14298 + LIBS=$ac_check_lib_save_LIBS
14299 + fi
14300 + echo "$as_me:$LINENO: result: $ac_cv_lib_mpfr_main" >&5
14301 + echo "${ECHO_T}$ac_cv_lib_mpfr_main" >&6
14302 + if test $ac_cv_lib_mpfr_main = yes; then
14303 +  CGAL_LIBS="$CGAL_LIBS -lmpfr"
14304 + fi
14305  
14306 < if test "x$cgal" = xyes; then
14307 <  USE_CGAL=yes
14306 >                        echo "$as_me:$LINENO: checking for main in -lgmp" >&5
14307 > echo $ECHO_N "checking for main in -lgmp... $ECHO_C" >&6
14308 > if test "${ac_cv_lib_gmp_main+set}" = set; then
14309 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14310 > else
14311 >  ac_check_lib_save_LIBS=$LIBS
14312 > LIBS="-lgmp  $LIBS"
14313 > cat >conftest.$ac_ext <<_ACEOF
14314 > /* confdefs.h.  */
14315 > _ACEOF
14316 > cat confdefs.h >>conftest.$ac_ext
14317 > cat >>conftest.$ac_ext <<_ACEOF
14318 > /* end confdefs.h.  */
14319  
14320 < cat >>confdefs.h <<\_ACEOF
14321 < #define HAVE_CGAL 1
14320 >
14321 > #ifdef FC_DUMMY_MAIN
14322 > #ifndef FC_DUMMY_MAIN_EQ_F77
14323 > #  ifdef __cplusplus
14324 >     extern "C"
14325 > #  endif
14326 >   int FC_DUMMY_MAIN() { return 1; }
14327 > #endif
14328 > #endif
14329 > int
14330 > main ()
14331 > {
14332 > main ();
14333 >  ;
14334 >  return 0;
14335 > }
14336   _ACEOF
14337 + rm -f conftest.$ac_objext conftest$ac_exeext
14338 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14339 +  (eval $ac_link) 2>conftest.er1
14340 +  ac_status=$?
14341 +  grep -v '^ *+' conftest.er1 >conftest.err
14342 +  rm -f conftest.er1
14343 +  cat conftest.err >&5
14344 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14345 +  (exit $ac_status); } &&
14346 +         { ac_try='test -z "$ac_c_werror_flag"
14347 +                         || test ! -s conftest.err'
14348 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14349 +  (eval $ac_try) 2>&5
14350 +  ac_status=$?
14351 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14352 +  (exit $ac_status); }; } &&
14353 +         { ac_try='test -s conftest$ac_exeext'
14354 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14355 +  (eval $ac_try) 2>&5
14356 +  ac_status=$?
14357 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14358 +  (exit $ac_status); }; }; then
14359 +  ac_cv_lib_gmp_main=yes
14360 + else
14361 +  echo "$as_me: failed program was:" >&5
14362 + sed 's/^/| /' conftest.$ac_ext >&5
14363  
14364 + ac_cv_lib_gmp_main=no
14365 + fi
14366 + rm -f conftest.err conftest.$ac_objext \
14367 +      conftest$ac_exeext conftest.$ac_ext
14368 + LIBS=$ac_check_lib_save_LIBS
14369 + fi
14370 + echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_main" >&5
14371 + echo "${ECHO_T}$ac_cv_lib_gmp_main" >&6
14372 + if test $ac_cv_lib_gmp_main = yes; then
14373 +  CGAL_LIBS="$CGAL_LIBS -lgmp"
14374 + fi
14375  
14376 < cat >>confdefs.h <<_ACEOF
14377 < #define CGAL_VERSION $CGAL_VERSION
14376 >                        echo "$as_me:$LINENO: checking for main in -lgmpxx" >&5
14377 > echo $ECHO_N "checking for main in -lgmpxx... $ECHO_C" >&6
14378 > if test "${ac_cv_lib_gmpxx_main+set}" = set; then
14379 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14380 > else
14381 >  ac_check_lib_save_LIBS=$LIBS
14382 > LIBS="-lgmpxx  $LIBS"
14383 > cat >conftest.$ac_ext <<_ACEOF
14384 > /* confdefs.h.  */
14385   _ACEOF
14386 + cat confdefs.h >>conftest.$ac_ext
14387 + cat >>conftest.$ac_ext <<_ACEOF
14388 + /* end confdefs.h.  */
14389  
14390 <  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
14391 <    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
14392 < echo "$as_me: WARNING: *****************************************************" >&2;}
14393 <    { echo "$as_me:$LINENO: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&5
14394 < echo "$as_me: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&2;}
14395 <    { echo "$as_me:$LINENO: WARNING: *** supported versions. It may still work though. ***" >&5
14396 < echo "$as_me: WARNING: *** supported versions. It may still work though. ***" >&2;}
14397 <    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
14398 < echo "$as_me: WARNING: *****************************************************" >&2;}
14399 <  fi
14390 >
14391 > #ifdef FC_DUMMY_MAIN
14392 > #ifndef FC_DUMMY_MAIN_EQ_F77
14393 > #  ifdef __cplusplus
14394 >     extern "C"
14395 > #  endif
14396 >   int FC_DUMMY_MAIN() { return 1; }
14397 > #endif
14398 > #endif
14399 > int
14400 > main ()
14401 > {
14402 > main ();
14403 >  ;
14404 >  return 0;
14405 > }
14406 > _ACEOF
14407 > rm -f conftest.$ac_objext conftest$ac_exeext
14408 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14409 >  (eval $ac_link) 2>conftest.er1
14410 >  ac_status=$?
14411 >  grep -v '^ *+' conftest.er1 >conftest.err
14412 >  rm -f conftest.er1
14413 >  cat conftest.err >&5
14414 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14415 >  (exit $ac_status); } &&
14416 >         { ac_try='test -z "$ac_c_werror_flag"
14417 >                         || test ! -s conftest.err'
14418 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14419 >  (eval $ac_try) 2>&5
14420 >  ac_status=$?
14421 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14422 >  (exit $ac_status); }; } &&
14423 >         { ac_try='test -s conftest$ac_exeext'
14424 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14425 >  (eval $ac_try) 2>&5
14426 >  ac_status=$?
14427 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14428 >  (exit $ac_status); }; }; then
14429 >  ac_cv_lib_gmpxx_main=yes
14430   else
14431 <   if test "x$cgal_makefile" != xno; then
14432 <    echo "$as_me:$LINENO: result: No CGAL support. These are not the droids you want." >&5
14433 < echo "${ECHO_T}No CGAL support. These are not the droids you want." >&6
14434 <  fi
13942 <  CGAL_INCLDIR=
13943 <  CGAL_LIBDIR=
13944 <  CGAL_RLIBDIR=
13945 <  CGAL_DEFINES=
13946 <  CGAL_CXXFLAGS=
13947 <  CGAL_LIBS=
14431 >  echo "$as_me: failed program was:" >&5
14432 > sed 's/^/| /' conftest.$ac_ext >&5
14433 >
14434 > ac_cv_lib_gmpxx_main=no
14435   fi
14436 + rm -f conftest.err conftest.$ac_objext \
14437 +      conftest$ac_exeext conftest.$ac_ext
14438 + LIBS=$ac_check_lib_save_LIBS
14439 + fi
14440 + echo "$as_me:$LINENO: result: $ac_cv_lib_gmpxx_main" >&5
14441 + echo "${ECHO_T}$ac_cv_lib_gmpxx_main" >&6
14442 + if test $ac_cv_lib_gmpxx_main = yes; then
14443 +  CGAL_LIBS="$CGAL_LIBS -lgmpxx"
14444 + fi
14445  
14446 +                fi
14447  
14448 < CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
14448 >                if test "$cgal_have_lib" == yes; then
14449 >                        acx_cgal_found=yes
14450 >                fi
14451 >        fi
14452 >        if test "$acx_cgal_found" == yes; then
14453 >                echo "$as_me:$LINENO: checking for main in -lCore" >&5
14454 > echo $ECHO_N "checking for main in -lCore... $ECHO_C" >&6
14455 > if test "${ac_cv_lib_Core_main+set}" = set; then
14456 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14457 > else
14458 >  ac_check_lib_save_LIBS=$LIBS
14459 > LIBS="-lCore  $LIBS"
14460 > cat >conftest.$ac_ext <<_ACEOF
14461 > /* confdefs.h.  */
14462 > _ACEOF
14463 > cat confdefs.h >>conftest.$ac_ext
14464 > cat >>conftest.$ac_ext <<_ACEOF
14465 > /* end confdefs.h.  */
14466  
13953 – CGAL_LIB_DIR=${CGAL_LIBDIR}
14467  
14468 < CGAL_RLIB_DIR=${CGAL_RLIBDIR}
14468 > #ifdef FC_DUMMY_MAIN
14469 > #ifndef FC_DUMMY_MAIN_EQ_F77
14470 > #  ifdef __cplusplus
14471 >     extern "C"
14472 > #  endif
14473 >   int FC_DUMMY_MAIN() { return 1; }
14474 > #endif
14475 > #endif
14476 > int
14477 > main ()
14478 > {
14479 > main ();
14480 >  ;
14481 >  return 0;
14482 > }
14483 > _ACEOF
14484 > rm -f conftest.$ac_objext conftest$ac_exeext
14485 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14486 >  (eval $ac_link) 2>conftest.er1
14487 >  ac_status=$?
14488 >  grep -v '^ *+' conftest.er1 >conftest.err
14489 >  rm -f conftest.er1
14490 >  cat conftest.err >&5
14491 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14492 >  (exit $ac_status); } &&
14493 >         { ac_try='test -z "$ac_c_werror_flag"
14494 >                         || test ! -s conftest.err'
14495 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14496 >  (eval $ac_try) 2>&5
14497 >  ac_status=$?
14498 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14499 >  (exit $ac_status); }; } &&
14500 >         { ac_try='test -s conftest$ac_exeext'
14501 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14502 >  (eval $ac_try) 2>&5
14503 >  ac_status=$?
14504 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14505 >  (exit $ac_status); }; }; then
14506 >  ac_cv_lib_Core_main=yes
14507 > else
14508 >  echo "$as_me: failed program was:" >&5
14509 > sed 's/^/| /' conftest.$ac_ext >&5
14510  
14511 + ac_cv_lib_Core_main=no
14512 + fi
14513 + rm -f conftest.err conftest.$ac_objext \
14514 +      conftest$ac_exeext conftest.$ac_ext
14515 + LIBS=$ac_check_lib_save_LIBS
14516 + fi
14517 + echo "$as_me:$LINENO: result: $ac_cv_lib_Core_main" >&5
14518 + echo "${ECHO_T}$ac_cv_lib_Core_main" >&6
14519 + if test $ac_cv_lib_Core_main = yes; then
14520 +  CGAL_LIBS="$CGAL_LIBS -lCore"
14521 + fi
14522  
14523 +        fi
14524 + fi
14525  
14526  
14527  
14528 + echo "$as_me:$LINENO: checking CGAL" >&5
14529 + echo $ECHO_N "checking CGAL... $ECHO_C" >&6
14530 + if test "$acx_cgal_found" == yes; then
14531 +        echo "$as_me:$LINENO: result: yes" >&5
14532 + echo "${ECHO_T}yes" >&6;
14533  
14534 + else
14535 +        echo "$as_me:$LINENO: result: no" >&5
14536 + echo "${ECHO_T}no" >&6
14537 +
14538 + fi
14539 + USE_CGAL=no
14540 + if test "$acx_cgal_found" == yes; then
14541 +        USE_CGAL=yes
14542 +
14543 + cat >>confdefs.h <<\_ACEOF
14544 + #define HAVE_CGAL 1
14545 + _ACEOF
14546 +
14547 +
14548 +
14549 +
14550 +
14551 + fi
14552 +
14553 +
14554 +
14555 +
14556   # Check whether --enable-doxygen or --disable-doxygen was given.
14557   if test "${enable_doxygen+set}" = set; then
14558    enableval="$enable_doxygen"
# Line 14112 | Line 14706 | fi
14706  
14707  
14708  
14709 <                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
14709 >                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/math/Makefile scripts/filepp"
14710  
14711  
14712   cat >confcache <<\_ACEOF
# Line 14477 | Line 15071 | cat >&5 <<_CSEOF
15071   } >&5
15072   cat >&5 <<_CSEOF
15073  
15074 < This file was extended by OOPSE $as_me 3.0, which was
15074 > This file was extended by OOPSE $as_me 4.0, which was
15075   generated by GNU Autoconf 2.59.  Invocation command line was
15076  
15077    CONFIG_FILES    = $CONFIG_FILES
# Line 14540 | Line 15134 | ac_cs_version="\\
15134  
15135   cat >>$CONFIG_STATUS <<_ACEOF
15136   ac_cs_version="\\
15137 < OOPSE config.status 3.0
15137 > OOPSE config.status 4.0
15138   configured by $0, generated by GNU Autoconf 2.59,
15139    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
15140  
# Line 14645 | Line 15239 | do
15239    # Handling of arguments.
15240    "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
15241    "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
15242 <  "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
15242 >  "src/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/math/Makefile" ;;
15243    "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
15244    "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
15245    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
# Line 14788 | Line 15382 | s,@FFTW_LIBS@,$FFTW_LIBS,;t t
15382   s,@FFTW_INC_DIR@,$FFTW_INC_DIR,;t t
15383   s,@FFTW_LIB_DIR@,$FFTW_LIB_DIR,;t t
15384   s,@FFTW_LIBS@,$FFTW_LIBS,;t t
15385 + s,@QHULL_INC_DIR@,$QHULL_INC_DIR,;t t
15386 + s,@QHULL_LIB_DIR@,$QHULL_LIB_DIR,;t t
15387 + s,@QHULL@,$QHULL,;t t
15388 + s,@USE_QHULL@,$USE_QHULL,;t t
15389   s,@LIBOBJS@,$LIBOBJS,;t t
15390   s,@POW_LIB@,$POW_LIB,;t t
15391   s,@CXXCPP@,$CXXCPP,;t t
# Line 14798 | Line 15396 | s,@USE_MPI@,$USE_MPI,;t t
15396   s,@MPI_LIB@,$MPI_LIB,;t t
15397   s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
15398   s,@USE_MPI@,$USE_MPI,;t t
14801 – s,@USE_CGAL@,$USE_CGAL,;t t
14802 – s,@CGAL_INC_DIR@,$CGAL_INC_DIR,;t t
14803 – s,@CGAL_LIB_DIR@,$CGAL_LIB_DIR,;t t
14804 – s,@CGAL_RLIB_DIR@,$CGAL_RLIB_DIR,;t t
14805 – s,@CGAL_DEFINES@,$CGAL_DEFINES,;t t
15399   s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
15400 + s,@CGAL_LDFLAGS@,$CGAL_LDFLAGS,;t t
15401 + s,@CGAL_CPPFLAGS@,$CGAL_CPPFLAGS,;t t
15402   s,@CGAL_LIBS@,$CGAL_LIBS,;t t
15403 + s,@USE_CGAL@,$USE_CGAL,;t t
15404   s,@DOXYGEN@,$DOXYGEN,;t t
15405   s,@DOT@,$DOT,;t t
15406   s,@DOC@,$DOC,;t t
# Line 15057 | Line 15653 | s,@INSTALL@,$ac_INSTALL,;t t
15653    case $ac_file in
15654      make/Makefile ) chmod 0755 scripts/* ;;
15655      src/utils/Makefile ) chmod 0755 scripts/* ;;
15656 <    src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
15656 >    src/math/Makefile ) chmod 0755 scripts/* ;;
15657      scripts/filepp ) chmod 0755 scripts/* ;;
15658    esac
15659   done

Diff Legend

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