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

Comparing trunk/configure (file contents):
Revision 1002 by gezelter, Fri Jul 7 19:44:54 2006 UTC vs.
Revision 1197 by chuckv, Thu Dec 6 20:40:07 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 LIBOBJS POW_LIB CXXCPP __func__ MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI USE_CGAL CGAL_CXXFLAGS CGAL_LDFLAGS CGAL_CPPFLAGS CGAL_LIBS 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 888 | Line 888 | Optional Packages:
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-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
891 <  --with-cgal-makefile=FILE  CGAL makefile that should be used
891 >  --with-cgalmakefile=makefile
892 >                          Use the following CGAL makefile
893  
894   Some influential environment variables:
895    CXX         C++ compiler command
# Line 1003 | Line 1004 | if $ac_init_version; then
1004   test -n "$ac_init_help" && exit 0
1005   if $ac_init_version; then
1006    cat <<\_ACEOF
1007 < OOPSE configure 3.0
1007 > OOPSE configure 4.0
1008   generated by GNU Autoconf 2.59
1009  
1010   Copyright (C) 2003 Free Software Foundation, Inc.
# Line 1017 | Line 1018 | running configure, to aid debugging if configure makes
1018   This file contains any messages produced by compilers while
1019   running configure, to aid debugging if configure makes a mistake.
1020  
1021 < It was created by OOPSE $as_me 3.0, which was
1021 > It was created by OOPSE $as_me 4.0, which was
1022   generated by GNU Autoconf 2.59.  Invocation command line was
1023  
1024    $ $0 $@
# Line 1439 | Line 1440 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1440   # Figure out how the Fortran 90 compiler constructs module file names
1441   #
1442   # AC_F90_MODULE_NAMES
1443 +
1444 +
1445 +
1446 +
1447 +
1448 +
1449 +
1450 +
1451 +
1452 +
1453 +
1454 +
1455 +
1456 +
1457 +
1458 +
1459 +
1460 +
1461  
1462  
1463  
# Line 1527 | Line 1546 | ac_configure="$SHELL $ac_aux_dir/configure" # This sho
1546  
1547  
1548  
1549 +
1550 +
1551 +
1552 + # This is taken from http://autoqt.sourceforge.net/
1553 + # Copyright (c) 2002, Geoffrey Wossum
1554 + # All rights reserved.
1555 +
1556 + # Redistribution and use in source and binary forms, with or without
1557 + # modification, are permitted provided that the following conditions are
1558 + # met:
1559 +
1560 + #  - Redistributions of source code must retain the above copyright notice,
1561 + #    this list of conditions and the following disclaimer.
1562 +
1563 + #  - Redistributions in binary form must reproduce the above copyright
1564 + #    notice, this list of conditions and the following disclaimer in the
1565 + #    documentation and/or other materials provided with the distribution.
1566 +
1567 + #  - Neither the name of Geoffrey Wossum nor the names of its
1568 + #    contributors may be used to endorse or promote products derived from
1569 + #    this software without specific prior written permission.
1570 +
1571 +
1572 + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1573 + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
1574 + # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1575 + # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
1576 + # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1577 + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1578 + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
1579 + # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
1580 + # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
1581 + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
1582 + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1583 +
1584 +
1585 + # Check for Qt compiler flags, linker flags, and binary packages
1586 +
1587 +
1588 +
1589   # who am i
1590   # Make sure we can run config.sub.
1591   $ac_config_sub sun4 >/dev/null 2>&1 ||
# Line 2809 | Line 2868 | fi
2868  
2869  
2870   # Provide some information about the compiler.
2871 < echo "$as_me:2812:" \
2871 > echo "$as_me:2871:" \
2872       "checking for Fortran compiler version" >&5
2873   ac_compiler=`set X $ac_compile; echo $2`
2874   { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
# Line 4057 | Line 4116 | FCFLAGS="$FCFLAGS $ac_verb"
4116   # flags.
4117   ac_save_FFLAGS=$FCFLAGS
4118   FCFLAGS="$FCFLAGS $ac_verb"
4119 < (eval echo $as_me:4060: \"$ac_link\") >&5
4119 > (eval echo $as_me:4119: \"$ac_link\") >&5
4120   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4121   echo "$ac_fc_v_output" >&5
4122   FCFLAGS=$ac_save_FFLAGS
# Line 4135 | Line 4194 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4194   # flags.
4195   ac_save_FFLAGS=$FCFLAGS
4196   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4197 < (eval echo $as_me:4138: \"$ac_link\") >&5
4197 > (eval echo $as_me:4197: \"$ac_link\") >&5
4198   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4199   echo "$ac_fc_v_output" >&5
4200   FCFLAGS=$ac_save_FFLAGS
# Line 4871 | Line 4930 | FCFLAGS="$FCFLAGS $ac_verb"
4930   # flags.
4931   ac_save_FFLAGS=$FCFLAGS
4932   FCFLAGS="$FCFLAGS $ac_verb"
4933 < (eval echo $as_me:4874: \"$ac_link\") >&5
4933 > (eval echo $as_me:4933: \"$ac_link\") >&5
4934   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4935   echo "$ac_fc_v_output" >&5
4936   FCFLAGS=$ac_save_FFLAGS
# Line 4949 | Line 5008 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
5008   # flags.
5009   ac_save_FFLAGS=$FCFLAGS
5010   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
5011 < (eval echo $as_me:4952: \"$ac_link\") >&5
5011 > (eval echo $as_me:5011: \"$ac_link\") >&5
5012   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
5013   echo "$ac_fc_v_output" >&5
5014   FCFLAGS=$ac_save_FFLAGS
# Line 6148 | Line 6207 | else
6207    withval="$with_fftw"
6208    fftw_dir="$withval"
6209   else
6210 <                fftw_dir="not_set"
6210 >             fftw_dir="not_set"
6211   fi;
6212   if test "$fftw_dir" != "no"; then
6213 <
6214 < if test "$fftw_dir" != "not_set" ; then
6215 <  if test -d "$fftw_dir"
6216 <  then
6217 <    FFTW_HOME="$fftw_dir"
6159 <  else
6160 <    { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
6213 >  if test "$fftw_dir" != "not_set" ; then
6214 >    if test -d "$fftw_dir"; then
6215 >      FFTW_HOME="$fftw_dir"
6216 >    else
6217 >      { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
6218   echo "$as_me: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&2;}
6219 <  fi
6220 < 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
6219 >      FFTW_HOME=/usr/local
6220 >      if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"; then
6221          FFTW_HOME=/usr
6222 < fi
6222 >      fi
6223 >    fi
6224 >    #
6225 >    # Locate fftw, if wanted
6226 >    #
6227 >    if test -n "${FFTW_HOME}"; then
6228 >      FFTW_OLD_LDFLAGS=$LDFLAGS
6229 >      FFTW_OLD_CPPFLAGS=$LDFLAGS
6230 >      LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
6231 >      CPPFLAGS="$CPPFLAGS -I${FFTW_HOME}/include"
6232  
6171 – #
6172 – # Locate fftw, if wanted
6173 – #
6174 – if test -n "${FFTW_HOME}"
6175 – then
6176 –        FFTW_OLD_LDFLAGS=$LDFLAGS
6177 –        FFTW_OLD_CPPFLAGS=$LDFLAGS
6178 –        LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
6179 –        CPPFLAGS="$CPPFLAGS -I${FFTW_HOME}/include"
6233  
6234 <
6182 <        ac_ext=c
6234 >      ac_ext=c
6235   ac_cpp='$CPP $CPPFLAGS'
6236   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6237   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6238   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6239  
6240 <        echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
6240 >      echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
6241   echo $ECHO_N "checking for fftw_execute in -lfftw3... $ECHO_C" >&6
6242   if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then
6243    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6263 | Line 6315 | fi
6315    fftw_cv_libfftw3=no
6316   fi
6317  
6318 <        if test "${ac_cv_header_fftw3_h+set}" = set; then
6318 >      if test "${ac_cv_header_fftw3_h+set}" = set; then
6319    echo "$as_me:$LINENO: checking for fftw3.h" >&5
6320   echo $ECHO_N "checking for fftw3.h... $ECHO_C" >&6
6321   if test "${ac_cv_header_fftw3_h+set}" = set; then
# Line 6407 | Line 6459 | fi
6459   fi
6460  
6461  
6462 <        if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"
6463 <        then
6412 <                echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
6462 >      if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"; then
6463 >        echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
6464   echo $ECHO_N "checking for fftwnd_one in -lfftw... $ECHO_C" >&6
6465   if test "${ac_cv_lib_fftw_fftwnd_one+set}" = set; then
6466    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6487 | Line 6538 | fi
6538    fftw_cv_libfftw=no
6539   fi
6540  
6541 <                if test "${ac_cv_header_fftw_h+set}" = set; then
6541 >        if test "${ac_cv_header_fftw_h+set}" = set; then
6542    echo "$as_me:$LINENO: checking for fftw.h" >&5
6543   echo $ECHO_N "checking for fftw.h... $ECHO_C" >&6
6544   if test "${ac_cv_header_fftw_h+set}" = set; then
# Line 6631 | Line 6682 | fi
6682   fi
6683  
6684  
6685 <                if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"
6686 <                then
6636 <                        echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
6685 >        if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"; then
6686 >          echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
6687   echo $ECHO_N "checking for fftwnd_one in -ldfftw... $ECHO_C" >&6
6688   if test "${ac_cv_lib_dfftw_fftwnd_one+set}" = set; then
6689    echo $ECHO_N "(cached) $ECHO_C" >&6
# Line 6711 | Line 6761 | fi
6761    fftw_cv_libdfftw=no
6762   fi
6763  
6764 <                        if test "${ac_cv_header_dfftw_h+set}" = set; then
6764 >          if test "${ac_cv_header_dfftw_h+set}" = set; then
6765    echo "$as_me:$LINENO: checking for dfftw.h" >&5
6766   echo $ECHO_N "checking for dfftw.h... $ECHO_C" >&6
6767   if test "${ac_cv_header_dfftw_h+set}" = set; then
# Line 6855 | Line 6905 | fi
6905   fi
6906  
6907  
6858 –                fi
6908          fi
6909 <        ac_ext=c
6909 >      fi
6910 >      ac_ext=c
6911   ac_cpp='$CPP $CPPFLAGS'
6912   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6913   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6914   ac_compiler_gnu=$ac_cv_c_compiler_gnu
6915  
6916 +      if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"; then
6917  
6867 –        if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"
6868 –        then
6869 –
6918   cat >>confdefs.h <<\_ACEOF
6919   #define HAVE_FFTW3_H 1
6920   _ACEOF
6921  
6922 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6923 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6924 <                FFTW_LIBS="-lfftw3"
6925 <        else
6926 <        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"
6879 <        then
6922 >        FFTW_INC_DIR="${FFTW_HOME}/include"
6923 >        FFTW_LIB_DIR="${FFTW_HOME}/lib"
6924 >        FFTW_LIBS="-lfftw3"
6925 >      else
6926 >        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"; then
6927  
6928   cat >>confdefs.h <<\_ACEOF
6929   #define HAVE_FFTW_H 1
6930   _ACEOF
6931  
6932 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6933 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6934 <                FFTW_LIBS="-lfftw"
6932 >          FFTW_INC_DIR="${FFTW_HOME}/include"
6933 >          FFTW_LIB_DIR="${FFTW_HOME}/lib"
6934 >          FFTW_LIBS="-lfftw"
6935          else
6936 <        if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"
6890 <        then
6936 >          if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"; then
6937  
6938   cat >>confdefs.h <<\_ACEOF
6939   #define HAVE_DFFTW_H 1
6940   _ACEOF
6941  
6942 <                FFTW_INC_DIR="${FFTW_HOME}/include"
6943 <                FFTW_LIB_DIR="${FFTW_HOME}/lib"
6944 <                FFTW_LIBS="-ldfftw"
6945 <        else
6946 <                echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
6942 >            FFTW_INC_DIR="${FFTW_HOME}/include"
6943 >            FFTW_LIB_DIR="${FFTW_HOME}/lib"
6944 >            FFTW_LIBS="-ldfftw"
6945 >          else
6946 >            echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
6947   echo $ECHO_N "checking fftw in ${FFTW_HOME}... $ECHO_C" >&6
6948 <                FFTW_INC_DIR=
6949 <                FFTW_LIB_DIR=
6950 <                FFTW_LIBS=
6951 <                LDFLAGS="$FFTW_OLD_LDFLAGS"
6952 <                CPPFLAGS="$FFTW_OLD_CPPFLAGS"
6953 <                echo "$as_me:$LINENO: result: failed" >&5
6954 < echo "${ECHO_T}failed" >&6
6955 <        echo ""
6956 <        echo "*********************************************************"
6957 <        echo "* WARNING: Could not find a working FFTW installation   *"
6958 <        echo "* If you need the staticProps program to be able to     *"
6959 <        echo "* compute undulation spectra, be sure to specify a      *"
6960 <        echo "* valid fftw installation with --with-fftw=DIR          *"
6961 <        echo "*                                                       *"
6962 <        echo "* OOPSE will still work without fftw installed.         *"
6963 <        echo "*********************************************************"
6964 <        echo ""
6965 <        fi
6920 <        fi
6948 >            FFTW_INC_DIR=
6949 >            FFTW_LIB_DIR=
6950 >            FFTW_LIBS=
6951 >            LDFLAGS="$FFTW_OLD_LDFLAGS"
6952 >            CPPFLAGS="$FFTW_OLD_CPPFLAGS"
6953 >            echo "$as_me:$LINENO: result: failed" >&5
6954 > echo "${ECHO_T}failed" >&6
6955 >            echo ""
6956 >            echo "*********************************************************"
6957 >            echo "* WARNING: Could not find a working FFTW installation   *"
6958 >            echo "* If you need the staticProps program to be able to     *"
6959 >            echo "* compute undulation spectra, be sure to specify a      *"
6960 >            echo "* valid fftw installation with --with-fftw=DIR          *"
6961 >            echo "*                                                       *"
6962 >            echo "* OOPSE will still work without fftw installed.         *"
6963 >            echo "*********************************************************"
6964 >            echo ""
6965 >          fi
6966          fi
6967 +      fi
6968  
6969  
6970  
6971 +    fi
6972 +  fi
6973   fi
6926 – fi
6974  
6975  
6976  
# Line 11941 | Line 11988 | if test "$ac_test_FFLAGS" != "set"; then
11988    case "${host_cpu}-${host_os}" in
11989  
11990    *linux*) if test "$FC" = ifc -o "$FC" = ifort; then
11991 <                    FCFLAGS="-O3 -ip -no-prec-div -cxxlib-icc"
11991 >                    FCFLAGS="-O3 -ip -no-prec-div"
11992                  fi;;
11993     rs6000*-aix*)  if test "$FC" = xlf90 -o "$FC" = f90 -o "$FC" = xlf95; then
11994                      FCFLAGS="-O3 -qarch=pwrx -qtune=pwrx -qansialias -w"
# Line 13511 | Line 13558 | fi
13558  
13559  
13560  
13561 < USE_CGAL=no
13515 < cgal_makefile=auto
13561 > acx_cgal_found=no
13562  
13563 < # Check whether --with-cgal-makefile or --without-cgal-makefile was given.
13564 < if test "${with_cgal_makefile+set}" = set; then
13565 <  withval="$with_cgal_makefile"
13566 <  cgal_makefile="$withval"
13563 > # Check whether --with-cgalmakefile or --without-cgalmakefile was given.
13564 > if test "${with_cgalmakefile+set}" = set; then
13565 >  withval="$with_cgalmakefile"
13566 >
13567   fi;
13568 + case $with_cgalmakefile in
13569 +        yes | "") ;;
13570 +        no) acx_cgal_found=disable ;;
13571 +        -* | */* | *.a | *.so | *.so.* | *.o) CGAL_MAKEFILE="$with_cgalmakefile" ;;
13572 +        *) CGAL_MAKEFILE="$with_cgalmakefile" ;;
13573 + esac
13574  
13575 < if test "x$cgal_makefile" != xno; then
13575 > if test "$acx_cgal_found" == no; then
13576 >    echo "$as_me:$LINENO: checking CGAL_MAKEFILE" >&5
13577 > echo $ECHO_N "checking CGAL_MAKEFILE... $ECHO_C" >&6
13578  
13579 <  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
13526 <    cgal_makefile="$CGAL_MAKEFILE"
13527 <  fi
13579 >    if test \! -z "$CGAL_MAKEFILE"; then
13580  
13581 <  echo "$as_me:$LINENO: checking for cgal_makefile: $cgal_makefile" >&5
13582 < echo $ECHO_N "checking for cgal_makefile: $cgal_makefile... $ECHO_C" >&6
13581 >        if test -e "$CGAL_MAKEFILE"; then
13582 >            tname=`mktemp /tmp/cgal_makefile_dsrXXXXXX`
13583  
13584 <  if test -f "$cgal_makefile"; then
13584 > cat > $tname << _ACEOF
13585 > include $CGAL_MAKEFILE
13586  
13587 <    cat >config.tmp.Makefile <<EOF
13588 < include $cgal_makefile
13536 < default:
13537 <        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
13538 <        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
13539 <        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
13540 <        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
13541 <        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
13542 <        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
13543 <        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
13544 <        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
13545 <        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
13546 <        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
13547 <        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
13548 <        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
13549 < EOF
13587 > cppflags:
13588 >        @echo \$(CGAL_CXXFLAGS)
13589  
13590 <    make -s -f config.tmp.Makefile
13591 <    . config.tmp.cgalvariables
13592 <
13593 <    rm -f config.tmp.Makefile config.tmp.cgalvariables
13594 <
13595 <    if test "x$CGAL_INCLDIR" = "x"; then
13596 <      CGAL_INCLDIR=""
13590 > cxxflags:
13591 >        @echo
13592 > ldflags:
13593 >        @echo \$(CGAL_LDFLAGS)
13594 > _ACEOF
13595 >            CGAL_CPPFLAGS="`make -s -f $tname cppflags`"
13596 >            CGAL_CXXFLAGS="`make -s -f $tname cxxflags`"
13597 >            CGAL_LDFLAGST="`make -s -f $tname ldflags`"
13598 >            for i in $CGAL_LDFLAGST; do
13599 >                if test `echo $i| grep -c ^-l`; then
13600 >                    CGAL_LIBS="$CGAL_LIBS $i"
13601 >                else
13602 >                    CGAL_LDFLAGS="$CGAL_LDFLAGS $i"
13603 >                fi
13604 >            done
13605 >            rm -f $tname
13606 >            echo "$as_me:$LINENO: result: yes" >&5
13607 > echo "${ECHO_T}yes" >&6
13608 >            acx_cgal_found=yes
13609 >                                   else
13610 >            echo "$as_me:$LINENO: result: invalid" >&5
13611 > echo "${ECHO_T}invalid" >&6
13612 >            { { echo "$as_me:$LINENO: error: CGAL_MAKEFILE defined, but the makefile does not exist." >&5
13613 > echo "$as_me: error: CGAL_MAKEFILE defined, but the makefile does not exist." >&2;}
13614 >   { (exit 1); exit 1; }; }
13615 >        fi
13616 >    else
13617 >        echo "$as_me:$LINENO: result: not defined" >&5
13618 > echo "${ECHO_T}not defined" >&6
13619      fi
13620 + fi
13621  
13622 <    if test "x$CGAL_LIBDIR" = "x"; then
13623 <      CGAL_LIBDIR=""
13624 <    fi
13625 <
13626 <    if test "x$CGAL_RLIBDIR" = "x"; then
13565 <      CGAL_RLIBDIR=""
13566 <    fi
13567 <
13568 <    if test "x$LEDA_INCLDIR" = "x"; then
13569 <      LEDA_INCLDIR=""
13570 <    fi
13571 <
13572 <    if test "x$LEDA_LIBDIR" = "x"; then
13573 <      LEDA_LIBDIR=""
13574 <    fi
13575 <
13576 <    if test "x$LEDA_RLIBDIR" = "x"; then
13577 <      LEDA_RLIBDIR=""
13578 <    fi
13579 <
13580 <    if test "x$GMP_INCLDIR" = "x"; then
13581 <      GMP_INCLDIR=""
13582 <    fi
13583 <
13584 <    if test "x$GMP_LIBDIR" = "x"; then
13585 <      GMP_LIBDIR=""
13586 <    fi
13587 <
13588 <    if test "x$GMP_RLIBDIR" = "x"; then
13589 <      GMP_RLIBDIR=""
13590 <    fi
13591 <
13592 <    echo "$as_me:$LINENO: result: CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&5
13593 < echo "${ECHO_T}CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&6
13594 <    echo "$as_me:$LINENO: result: CGAL_INCLDIR=       $CGAL_INCLDIR" >&5
13595 < echo "${ECHO_T}CGAL_INCLDIR=       $CGAL_INCLDIR" >&6
13596 <    echo "$as_me:$LINENO: result: CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&5
13597 < echo "${ECHO_T}CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&6
13598 <    echo "$as_me:$LINENO: result: CGAL_LIBDIR=        $CGAL_LIBDIR" >&5
13599 < echo "${ECHO_T}CGAL_LIBDIR=        $CGAL_LIBDIR" >&6
13600 <    echo "$as_me:$LINENO: result: CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&5
13601 < echo "${ECHO_T}CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&6
13602 <    echo "$as_me:$LINENO: result: LEDA_INCLDIR=       $LEDA_INCLDIR" >&5
13603 < echo "${ECHO_T}LEDA_INCLDIR=       $LEDA_INCLDIR" >&6
13604 <    echo "$as_me:$LINENO: result: LEDA_LIBDIR=        $LEDA_LIBDIR" >&5
13605 < echo "${ECHO_T}LEDA_LIBDIR=        $LEDA_LIBDIR" >&6
13606 <    echo "$as_me:$LINENO: result: GMP_INCLDIR=        $GMP_INCLDIR" >&5
13607 < echo "${ECHO_T}GMP_INCLDIR=        $GMP_INCLDIR" >&6
13608 <    echo "$as_me:$LINENO: result: GMP_LIBDIR=         $GMP_LIBDIR" >&5
13609 < echo "${ECHO_T}GMP_LIBDIR=         $GMP_LIBDIR" >&6
13610 <
13611 <    ac_ext=cc
13612 < ac_cpp='$CXXCPP $CPPFLAGS'
13613 < ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13614 < ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13615 < ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13616 <
13617 <    save_CXXFLAGS="$CXXFLAGS"
13618 <    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13619 <    if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13620 <  echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
13621 < echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
13622 < if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13622 > if test "$acx_cgal_found" == no; then
13623 >        if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
13624 >  echo "$as_me:$LINENO: checking for CGAL/Exact_predicates_inexact_constructions_kernel.h" >&5
13625 > echo $ECHO_N "checking for CGAL/Exact_predicates_inexact_constructions_kernel.h... $ECHO_C" >&6
13626 > if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
13627    echo $ECHO_N "(cached) $ECHO_C" >&6
13628   fi
13629 < echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
13630 < echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
13629 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&5
13630 > echo "${ECHO_T}$ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&6
13631   else
13632    # Is the header compilable?
13633 < echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5
13634 < echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6
13633 > echo "$as_me:$LINENO: checking CGAL/Exact_predicates_inexact_constructions_kernel.h usability" >&5
13634 > echo $ECHO_N "checking CGAL/Exact_predicates_inexact_constructions_kernel.h usability... $ECHO_C" >&6
13635   cat >conftest.$ac_ext <<_ACEOF
13636   /* confdefs.h.  */
13637   _ACEOF
# Line 13635 | Line 13639 | $ac_includes_default
13639   cat >>conftest.$ac_ext <<_ACEOF
13640   /* end confdefs.h.  */
13641   $ac_includes_default
13642 < #include <CGAL/Cartesian.h>
13642 > #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
13643   _ACEOF
13644   rm -f conftest.$ac_objext
13645   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
# Line 13646 | Line 13650 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13650    cat conftest.err >&5
13651    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13652    (exit $ac_status); } &&
13653 <         { ac_try='test -z "$ac_cxx_werror_flag"
13653 >         { ac_try='test -z "$ac_c_werror_flag"
13654                           || test ! -s conftest.err'
13655    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13656    (eval $ac_try) 2>&5
# Line 13671 | Line 13675 | echo "${ECHO_T}$ac_header_compiler" >&6
13675   echo "${ECHO_T}$ac_header_compiler" >&6
13676  
13677   # Is the header present?
13678 < echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5
13679 < echo $ECHO_N "checking CGAL/Cartesian.h presence... $ECHO_C" >&6
13678 > echo "$as_me:$LINENO: checking CGAL/Exact_predicates_inexact_constructions_kernel.h presence" >&5
13679 > echo $ECHO_N "checking CGAL/Exact_predicates_inexact_constructions_kernel.h presence... $ECHO_C" >&6
13680   cat >conftest.$ac_ext <<_ACEOF
13681   /* confdefs.h.  */
13682   _ACEOF
13683   cat confdefs.h >>conftest.$ac_ext
13684   cat >>conftest.$ac_ext <<_ACEOF
13685   /* end confdefs.h.  */
13686 < #include <CGAL/Cartesian.h>
13686 > #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
13687   _ACEOF
13688   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
13689    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# Line 13690 | Line 13694 | if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
13694    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13695    (exit $ac_status); } >/dev/null; then
13696    if test -s conftest.err; then
13697 <    ac_cpp_err=$ac_cxx_preproc_warn_flag
13698 <    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
13697 >    ac_cpp_err=$ac_c_preproc_warn_flag
13698 >    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
13699    else
13700      ac_cpp_err=
13701    fi
# Line 13711 | Line 13715 | echo "${ECHO_T}$ac_header_preproc" >&6
13715   echo "${ECHO_T}$ac_header_preproc" >&6
13716  
13717   # So?  What about this header?
13718 < case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
13718 > case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
13719    yes:no: )
13720 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&5
13721 < echo "$as_me: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
13722 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&5
13723 < echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&2;}
13720 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: accepted by the compiler, rejected by the preprocessor!" >&5
13721 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
13722 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the compiler's result" >&5
13723 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the compiler's result" >&2;}
13724      ac_header_preproc=yes
13725      ;;
13726    no:yes:* )
13727 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&5
13728 < echo "$as_me: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&2;}
13729 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&5
13730 < echo "$as_me: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&2;}
13731 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&5
13732 < echo "$as_me: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&2;}
13733 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&5
13734 < echo "$as_me: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
13735 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&5
13736 < echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&2;}
13737 <    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&5
13738 < echo "$as_me: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&2;}
13727 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: present but cannot be compiled" >&5
13728 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: present but cannot be compiled" >&2;}
13729 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     check for missing prerequisite headers?" >&5
13730 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     check for missing prerequisite headers?" >&2;}
13731 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: see the Autoconf documentation" >&5
13732 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: see the Autoconf documentation" >&2;}
13733 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     section \"Present But Cannot Be Compiled\"" >&5
13734 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
13735 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the preprocessor's result" >&5
13736 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the preprocessor's result" >&2;}
13737 >    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: in the future, the compiler will take precedence" >&5
13738 > echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: in the future, the compiler will take precedence" >&2;}
13739      (
13740        cat <<\_ASBOX
13741   ## ------------------------------ ##
# Line 13742 | Line 13746 | esac
13746        sed "s/^/$as_me: WARNING:     /" >&2
13747      ;;
13748   esac
13749 < echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
13750 < echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
13751 < if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13749 > echo "$as_me:$LINENO: checking for CGAL/Exact_predicates_inexact_constructions_kernel.h" >&5
13750 > echo $ECHO_N "checking for CGAL/Exact_predicates_inexact_constructions_kernel.h... $ECHO_C" >&6
13751 > if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
13752    echo $ECHO_N "(cached) $ECHO_C" >&6
13753   else
13754 <  ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc
13754 >  ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h=$ac_header_preproc
13755   fi
13756 < echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
13757 < echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
13756 > echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&5
13757 > echo "${ECHO_T}$ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&6
13758  
13759   fi
13760 < if test $ac_cv_header_CGAL_Cartesian_h = yes; then
13761 <  cgal=yes
13760 > if test $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h = yes; then
13761 >  cgal_have_header=yes
13762   else
13763 <  cgal=no
13763 >  cgal_have_header=no
13764   fi
13765  
13766  
13767 <    CXXFLAGS="$save_CXXFLAGS"
13767 >        if test "$cgal_have_header" == yes; then
13768 >                echo "$as_me:$LINENO: checking for main in -lCGAL" >&5
13769 > echo $ECHO_N "checking for main in -lCGAL... $ECHO_C" >&6
13770 > if test "${ac_cv_lib_CGAL_main+set}" = set; then
13771 >  echo $ECHO_N "(cached) $ECHO_C" >&6
13772 > else
13773 >  ac_check_lib_save_LIBS=$LIBS
13774 > LIBS="-lCGAL  $LIBS"
13775 > cat >conftest.$ac_ext <<_ACEOF
13776 > /* confdefs.h.  */
13777 > _ACEOF
13778 > cat confdefs.h >>conftest.$ac_ext
13779 > cat >>conftest.$ac_ext <<_ACEOF
13780 > /* end confdefs.h.  */
13781  
13765 –    if test "x$cgal" = xyes; then
13766 –      echo "$as_me:$LINENO: checking for CGAL version" >&5
13767 – echo $ECHO_N "checking for CGAL version... $ECHO_C" >&6
13768 –      LOCATION=${CGAL_INCLDIR}
13769 –      LOCATION=${LOCATION:-/usr/include}
13770 –      if test -f $LOCATION/CGAL/version.h; then
13771 –        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
13772 –      else
13773 –        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
13774 –      fi
13775 –      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
13776 –        echo "$as_me:$LINENO: result: ($CGAL_VERSION) yes" >&5
13777 – echo "${ECHO_T}($CGAL_VERSION) yes" >&6
13778 –      else
13779 –        echo "$as_me:$LINENO: result: ($CGAL_VERSION) no" >&5
13780 – echo "${ECHO_T}($CGAL_VERSION) no" >&6
13781 –        cgal=no
13782 –      fi
13783 –    fi
13782  
13783 <    if test "x$cgal" = xyes; then
13784 <      CGAL_LIBS="-lCGAL"
13785 <      echo "$as_me:$LINENO: checking whether CGAL uses LEDA" >&5
13786 < echo $ECHO_N "checking whether CGAL uses LEDA... $ECHO_C" >&6
13787 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
13788 <        CGAL_USES_LEDA=yes
13789 <        echo "$as_me:$LINENO: result: yes" >&5
13790 < echo "${ECHO_T}yes" >&6
13791 <        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
13792 <      else
13793 <        echo "$as_me:$LINENO: result: no" >&5
13794 < echo "${ECHO_T}no" >&6
13795 <        CGAL_USES_LEDA=no
13796 <      fi
13783 > #ifdef FC_DUMMY_MAIN
13784 > #ifndef FC_DUMMY_MAIN_EQ_F77
13785 > #  ifdef __cplusplus
13786 >     extern "C"
13787 > #  endif
13788 >   int FC_DUMMY_MAIN() { return 1; }
13789 > #endif
13790 > #endif
13791 > int
13792 > main ()
13793 > {
13794 > main ();
13795 >  ;
13796 >  return 0;
13797 > }
13798 > _ACEOF
13799 > rm -f conftest.$ac_objext conftest$ac_exeext
13800 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13801 >  (eval $ac_link) 2>conftest.er1
13802 >  ac_status=$?
13803 >  grep -v '^ *+' conftest.er1 >conftest.err
13804 >  rm -f conftest.er1
13805 >  cat conftest.err >&5
13806 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13807 >  (exit $ac_status); } &&
13808 >         { ac_try='test -z "$ac_c_werror_flag"
13809 >                         || test ! -s conftest.err'
13810 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13811 >  (eval $ac_try) 2>&5
13812 >  ac_status=$?
13813 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13814 >  (exit $ac_status); }; } &&
13815 >         { ac_try='test -s conftest$ac_exeext'
13816 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13817 >  (eval $ac_try) 2>&5
13818 >  ac_status=$?
13819 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13820 >  (exit $ac_status); }; }; then
13821 >  ac_cv_lib_CGAL_main=yes
13822 > else
13823 >  echo "$as_me: failed program was:" >&5
13824 > sed 's/^/| /' conftest.$ac_ext >&5
13825  
13826 <      echo "$as_me:$LINENO: checking whether CGAL uses GMP" >&5
13827 < echo $ECHO_N "checking whether CGAL uses GMP... $ECHO_C" >&6
13828 <      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
13829 <        CGAL_USES_GMP=yes
13830 <        echo "$as_me:$LINENO: result: yes" >&5
13831 < echo "${ECHO_T}yes" >&6
13832 <        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
13833 <      else
13834 <        echo "$as_me:$LINENO: result: no" >&5
13835 < echo "${ECHO_T}no" >&6
13836 <        CGAL_USES_GMP=no
13837 <      fi
13826 > ac_cv_lib_CGAL_main=no
13827 > fi
13828 > rm -f conftest.err conftest.$ac_objext \
13829 >      conftest$ac_exeext conftest.$ac_ext
13830 > LIBS=$ac_check_lib_save_LIBS
13831 > fi
13832 > echo "$as_me:$LINENO: result: $ac_cv_lib_CGAL_main" >&5
13833 > echo "${ECHO_T}$ac_cv_lib_CGAL_main" >&6
13834 > if test $ac_cv_lib_CGAL_main = yes; then
13835 >  cgal_have_lib=yes
13836 > else
13837 >  cgal_have_lib=no
13838 > fi
13839  
13840 <      CGAL_LIBS="$CGAL_LIBS -lm"
13840 >                if test "$cgal_have_lib" == no; then
13841 >                        save_LIBS="$LIBS"; LIBS="$LIBS -lgmp -lmpfr -lm"
13842 >                        echo "$as_me:$LINENO: checking for main in -lCGAL" >&5
13843 > echo $ECHO_N "checking for main in -lCGAL... $ECHO_C" >&6
13844 > if test "${ac_cv_lib_CGAL_main+set}" = set; then
13845 >  echo $ECHO_N "(cached) $ECHO_C" >&6
13846 > else
13847 >  ac_check_lib_save_LIBS=$LIBS
13848 > LIBS="-lCGAL  $LIBS"
13849 > cat >conftest.$ac_ext <<_ACEOF
13850 > /* confdefs.h.  */
13851 > _ACEOF
13852 > cat confdefs.h >>conftest.$ac_ext
13853 > cat >>conftest.$ac_ext <<_ACEOF
13854 > /* end confdefs.h.  */
13855  
13815 –      CGAL_CXXFLAGS="-ftemplate-depth-50"
13856  
13857 <      echo "$as_me:$LINENO: result: CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&5
13858 < echo "${ECHO_T}CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&6
13859 <      echo "$as_me:$LINENO: result: CGAL_USES_GMP =     $CGAL_USES_GMP" >&5
13860 < echo "${ECHO_T}CGAL_USES_GMP =     $CGAL_USES_GMP" >&6
13861 <      echo "$as_me:$LINENO: result: CGAL_INCLDIR  =     $CGAL_INCLDIR" >&5
13862 < echo "${ECHO_T}CGAL_INCLDIR  =     $CGAL_INCLDIR" >&6
13863 <      echo "$as_me:$LINENO: result: CGAL_LIBDIR   =     $CGAL_LIBDIR" >&5
13864 < echo "${ECHO_T}CGAL_LIBDIR   =     $CGAL_LIBDIR" >&6
13865 <      echo "$as_me:$LINENO: result: CGAL_DEFINES  =     $CGAL_DEFINES" >&5
13866 < echo "${ECHO_T}CGAL_DEFINES  =     $CGAL_DEFINES" >&6
13867 <      echo "$as_me:$LINENO: result: CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&5
13868 < echo "${ECHO_T}CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&6
13869 <      echo "$as_me:$LINENO: result: CGAL_LIBS     =     $CGAL_LIBS" >&5
13870 < echo "${ECHO_T}CGAL_LIBS     =     $CGAL_LIBS" >&6
13871 <    fi
13857 > #ifdef FC_DUMMY_MAIN
13858 > #ifndef FC_DUMMY_MAIN_EQ_F77
13859 > #  ifdef __cplusplus
13860 >     extern "C"
13861 > #  endif
13862 >   int FC_DUMMY_MAIN() { return 1; }
13863 > #endif
13864 > #endif
13865 > int
13866 > main ()
13867 > {
13868 > main ();
13869 >  ;
13870 >  return 0;
13871 > }
13872 > _ACEOF
13873 > rm -f conftest.$ac_objext conftest$ac_exeext
13874 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13875 >  (eval $ac_link) 2>conftest.er1
13876 >  ac_status=$?
13877 >  grep -v '^ *+' conftest.er1 >conftest.err
13878 >  rm -f conftest.er1
13879 >  cat conftest.err >&5
13880 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13881 >  (exit $ac_status); } &&
13882 >         { ac_try='test -z "$ac_c_werror_flag"
13883 >                         || test ! -s conftest.err'
13884 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13885 >  (eval $ac_try) 2>&5
13886 >  ac_status=$?
13887 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13888 >  (exit $ac_status); }; } &&
13889 >         { ac_try='test -s conftest$ac_exeext'
13890 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13891 >  (eval $ac_try) 2>&5
13892 >  ac_status=$?
13893 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13894 >  (exit $ac_status); }; }; then
13895 >  ac_cv_lib_CGAL_main=yes
13896 > else
13897 >  echo "$as_me: failed program was:" >&5
13898 > sed 's/^/| /' conftest.$ac_ext >&5
13899  
13900 <    if test "x$cgal" = xyes; then
13901 <      save_LIBS="$LIBS"
13902 <      LIBS="$LIBS -L$CGAL_LIBDIR"
13903 <      if test "x$CGAL_USES_LEDA" = xyes; then
13904 <        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
13905 <      fi
13906 <      # if test "x$CGAL_USES_GMP" = xyes; then
13907 <      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
13908 <      # fi
13909 <      echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
13910 < echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
13911 < save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
13912 < CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13913 < save_LIBS_CHECK_CXX_LIB="$LIBS"
13914 < LIBS="-lCGAL  $LIBS"
13900 > ac_cv_lib_CGAL_main=no
13901 > fi
13902 > rm -f conftest.err conftest.$ac_objext \
13903 >      conftest$ac_exeext conftest.$ac_ext
13904 > LIBS=$ac_check_lib_save_LIBS
13905 > fi
13906 > echo "$as_me:$LINENO: result: $ac_cv_lib_CGAL_main" >&5
13907 > echo "${ECHO_T}$ac_cv_lib_CGAL_main" >&6
13908 > if test $ac_cv_lib_CGAL_main = yes; then
13909 >  CGAL_LIBS="-lCGAL -lgmp -lmpfr"
13910 >                                                  cgal_have_lib=yes
13911 > else
13912 >  cgal_have_lib=no
13913 > fi
13914 >
13915 >                        LIBS="$save_LIBS"
13916 >                else
13917 >                        CGAL_LIBS="-lCGAL"
13918 >                        echo "$as_me:$LINENO: checking for main in -lmpfr" >&5
13919 > echo $ECHO_N "checking for main in -lmpfr... $ECHO_C" >&6
13920 > if test "${ac_cv_lib_mpfr_main+set}" = set; then
13921 >  echo $ECHO_N "(cached) $ECHO_C" >&6
13922 > else
13923 >  ac_check_lib_save_LIBS=$LIBS
13924 > LIBS="-lmpfr  $LIBS"
13925   cat >conftest.$ac_ext <<_ACEOF
13926   /* confdefs.h.  */
13927   _ACEOF
13928   cat confdefs.h >>conftest.$ac_ext
13929   cat >>conftest.$ac_ext <<_ACEOF
13930   /* end confdefs.h.  */
13931 < #include <CGAL/Cartesian.h>
13931 >
13932 >
13933   #ifdef FC_DUMMY_MAIN
13934   #ifndef FC_DUMMY_MAIN_EQ_F77
13935   #  ifdef __cplusplus
# Line 13863 | Line 13941 | main ()
13941   int
13942   main ()
13943   {
13944 < ::CGAL::Cartesian<int>::Point_2 P
13944 > main ();
13945    ;
13946    return 0;
13947   }
# Line 13877 | Line 13955 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13955    cat conftest.err >&5
13956    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13957    (exit $ac_status); } &&
13958 <         { ac_try='test -z "$ac_cxx_werror_flag"
13958 >         { ac_try='test -z "$ac_c_werror_flag"
13959                           || test ! -s conftest.err'
13960    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13961    (eval $ac_try) 2>&5
# Line 13890 | Line 13968 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13968    ac_status=$?
13969    echo "$as_me:$LINENO: \$? = $ac_status" >&5
13970    (exit $ac_status); }; }; then
13971 <  echo "$as_me:$LINENO: result: yes" >&5
13894 < echo "${ECHO_T}yes" >&6
13895 < cgal=yes
13971 >  ac_cv_lib_mpfr_main=yes
13972   else
13973    echo "$as_me: failed program was:" >&5
13974   sed 's/^/| /' conftest.$ac_ext >&5
13975  
13976 < echo "$as_me:$LINENO: result: no" >&5
13901 < echo "${ECHO_T}no" >&6
13902 < cgal=no
13976 > ac_cv_lib_mpfr_main=no
13977   fi
13978   rm -f conftest.err conftest.$ac_objext \
13979        conftest$ac_exeext conftest.$ac_ext
13980 < CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB"
13981 < LIBS="$save_LIBS_CHECK_CXX_LIB"
13982 <      LIBS="$save_LIBS"
13983 <    fi
13980 > LIBS=$ac_check_lib_save_LIBS
13981 > fi
13982 > echo "$as_me:$LINENO: result: $ac_cv_lib_mpfr_main" >&5
13983 > echo "${ECHO_T}$ac_cv_lib_mpfr_main" >&6
13984 > if test $ac_cv_lib_mpfr_main = yes; then
13985 >  CGAL_LIBS="$CGAL_LIBS -lmpfr"
13986 > fi
13987  
13988 <  fi
13989 <  ac_ext=c
13990 < ac_cpp='$CPP $CPPFLAGS'
13991 < ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13992 < ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13993 < ac_compiler_gnu=$ac_cv_c_compiler_gnu
13988 >                        echo "$as_me:$LINENO: checking for main in -lgmp" >&5
13989 > echo $ECHO_N "checking for main in -lgmp... $ECHO_C" >&6
13990 > if test "${ac_cv_lib_gmp_main+set}" = set; then
13991 >  echo $ECHO_N "(cached) $ECHO_C" >&6
13992 > else
13993 >  ac_check_lib_save_LIBS=$LIBS
13994 > LIBS="-lgmp  $LIBS"
13995 > cat >conftest.$ac_ext <<_ACEOF
13996 > /* confdefs.h.  */
13997 > _ACEOF
13998 > cat confdefs.h >>conftest.$ac_ext
13999 > cat >>conftest.$ac_ext <<_ACEOF
14000 > /* end confdefs.h.  */
14001 >
14002 >
14003 > #ifdef FC_DUMMY_MAIN
14004 > #ifndef FC_DUMMY_MAIN_EQ_F77
14005 > #  ifdef __cplusplus
14006 >     extern "C"
14007 > #  endif
14008 >   int FC_DUMMY_MAIN() { return 1; }
14009 > #endif
14010 > #endif
14011 > int
14012 > main ()
14013 > {
14014 > main ();
14015 >  ;
14016 >  return 0;
14017 > }
14018 > _ACEOF
14019 > rm -f conftest.$ac_objext conftest$ac_exeext
14020 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14021 >  (eval $ac_link) 2>conftest.er1
14022 >  ac_status=$?
14023 >  grep -v '^ *+' conftest.er1 >conftest.err
14024 >  rm -f conftest.er1
14025 >  cat conftest.err >&5
14026 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14027 >  (exit $ac_status); } &&
14028 >         { ac_try='test -z "$ac_c_werror_flag"
14029 >                         || test ! -s conftest.err'
14030 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14031 >  (eval $ac_try) 2>&5
14032 >  ac_status=$?
14033 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14034 >  (exit $ac_status); }; } &&
14035 >         { ac_try='test -s conftest$ac_exeext'
14036 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14037 >  (eval $ac_try) 2>&5
14038 >  ac_status=$?
14039 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14040 >  (exit $ac_status); }; }; then
14041 >  ac_cv_lib_gmp_main=yes
14042 > else
14043 >  echo "$as_me: failed program was:" >&5
14044 > sed 's/^/| /' conftest.$ac_ext >&5
14045  
14046 <
14046 > ac_cv_lib_gmp_main=no
14047   fi
14048 + rm -f conftest.err conftest.$ac_objext \
14049 +      conftest$ac_exeext conftest.$ac_ext
14050 + LIBS=$ac_check_lib_save_LIBS
14051 + fi
14052 + echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_main" >&5
14053 + echo "${ECHO_T}$ac_cv_lib_gmp_main" >&6
14054 + if test $ac_cv_lib_gmp_main = yes; then
14055 +  CGAL_LIBS="$CGAL_LIBS -lgmp"
14056 + fi
14057  
14058 < if test "x$cgal" = xyes; then
14059 <  USE_CGAL=yes
14060 <
14061 < cat >>confdefs.h <<\_ACEOF
14062 < #define HAVE_CGAL 1
14058 >                        echo "$as_me:$LINENO: checking for main in -lgmpxx" >&5
14059 > echo $ECHO_N "checking for main in -lgmpxx... $ECHO_C" >&6
14060 > if test "${ac_cv_lib_gmpxx_main+set}" = set; then
14061 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14062 > else
14063 >  ac_check_lib_save_LIBS=$LIBS
14064 > LIBS="-lgmpxx  $LIBS"
14065 > cat >conftest.$ac_ext <<_ACEOF
14066 > /* confdefs.h.  */
14067   _ACEOF
14068 + cat confdefs.h >>conftest.$ac_ext
14069 + cat >>conftest.$ac_ext <<_ACEOF
14070 + /* end confdefs.h.  */
14071  
14072  
14073 < cat >>confdefs.h <<_ACEOF
14074 < #define CGAL_VERSION $CGAL_VERSION
14073 > #ifdef FC_DUMMY_MAIN
14074 > #ifndef FC_DUMMY_MAIN_EQ_F77
14075 > #  ifdef __cplusplus
14076 >     extern "C"
14077 > #  endif
14078 >   int FC_DUMMY_MAIN() { return 1; }
14079 > #endif
14080 > #endif
14081 > int
14082 > main ()
14083 > {
14084 > main ();
14085 >  ;
14086 >  return 0;
14087 > }
14088   _ACEOF
14089 + rm -f conftest.$ac_objext conftest$ac_exeext
14090 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14091 +  (eval $ac_link) 2>conftest.er1
14092 +  ac_status=$?
14093 +  grep -v '^ *+' conftest.er1 >conftest.err
14094 +  rm -f conftest.er1
14095 +  cat conftest.err >&5
14096 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14097 +  (exit $ac_status); } &&
14098 +         { ac_try='test -z "$ac_c_werror_flag"
14099 +                         || test ! -s conftest.err'
14100 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14101 +  (eval $ac_try) 2>&5
14102 +  ac_status=$?
14103 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14104 +  (exit $ac_status); }; } &&
14105 +         { ac_try='test -s conftest$ac_exeext'
14106 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14107 +  (eval $ac_try) 2>&5
14108 +  ac_status=$?
14109 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14110 +  (exit $ac_status); }; }; then
14111 +  ac_cv_lib_gmpxx_main=yes
14112 + else
14113 +  echo "$as_me: failed program was:" >&5
14114 + sed 's/^/| /' conftest.$ac_ext >&5
14115  
14116 <  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
14117 <    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
14118 < echo "$as_me: WARNING: *****************************************************" >&2;}
14119 <    { echo "$as_me:$LINENO: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&5
14120 < echo "$as_me: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&2;}
14121 <    { echo "$as_me:$LINENO: WARNING: *** supported versions. It may still work though. ***" >&5
14122 < echo "$as_me: WARNING: *** supported versions. It may still work though. ***" >&2;}
14123 <    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
14124 < echo "$as_me: WARNING: *****************************************************" >&2;}
14125 <  fi
14116 > ac_cv_lib_gmpxx_main=no
14117 > fi
14118 > rm -f conftest.err conftest.$ac_objext \
14119 >      conftest$ac_exeext conftest.$ac_ext
14120 > LIBS=$ac_check_lib_save_LIBS
14121 > fi
14122 > echo "$as_me:$LINENO: result: $ac_cv_lib_gmpxx_main" >&5
14123 > echo "${ECHO_T}$ac_cv_lib_gmpxx_main" >&6
14124 > if test $ac_cv_lib_gmpxx_main = yes; then
14125 >  CGAL_LIBS="$CGAL_LIBS -lgmpxx"
14126 > fi
14127 >
14128 >                fi
14129 >
14130 >                if test "$cgal_have_lib" == yes; then
14131 >                        acx_cgal_found=yes
14132 >                fi
14133 >        fi
14134 >        if test "$acx_cgal_found" == yes; then
14135 >                echo "$as_me:$LINENO: checking for main in -lCore" >&5
14136 > echo $ECHO_N "checking for main in -lCore... $ECHO_C" >&6
14137 > if test "${ac_cv_lib_Core_main+set}" = set; then
14138 >  echo $ECHO_N "(cached) $ECHO_C" >&6
14139   else
14140 <   if test "x$cgal_makefile" != xno; then
14141 <    echo "$as_me:$LINENO: result: No CGAL support. These are not the droids you want." >&5
14142 < echo "${ECHO_T}No CGAL support. These are not the droids you want." >&6
14143 <  fi
14144 <  CGAL_INCLDIR=
14145 <  CGAL_LIBDIR=
14146 <  CGAL_RLIBDIR=
14147 <  CGAL_DEFINES=
14148 <  CGAL_CXXFLAGS=
14149 <  CGAL_LIBS=
14140 >  ac_check_lib_save_LIBS=$LIBS
14141 > LIBS="-lCore  $LIBS"
14142 > cat >conftest.$ac_ext <<_ACEOF
14143 > /* confdefs.h.  */
14144 > _ACEOF
14145 > cat confdefs.h >>conftest.$ac_ext
14146 > cat >>conftest.$ac_ext <<_ACEOF
14147 > /* end confdefs.h.  */
14148 >
14149 >
14150 > #ifdef FC_DUMMY_MAIN
14151 > #ifndef FC_DUMMY_MAIN_EQ_F77
14152 > #  ifdef __cplusplus
14153 >     extern "C"
14154 > #  endif
14155 >   int FC_DUMMY_MAIN() { return 1; }
14156 > #endif
14157 > #endif
14158 > int
14159 > main ()
14160 > {
14161 > main ();
14162 >  ;
14163 >  return 0;
14164 > }
14165 > _ACEOF
14166 > rm -f conftest.$ac_objext conftest$ac_exeext
14167 > if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
14168 >  (eval $ac_link) 2>conftest.er1
14169 >  ac_status=$?
14170 >  grep -v '^ *+' conftest.er1 >conftest.err
14171 >  rm -f conftest.er1
14172 >  cat conftest.err >&5
14173 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14174 >  (exit $ac_status); } &&
14175 >         { ac_try='test -z "$ac_c_werror_flag"
14176 >                         || test ! -s conftest.err'
14177 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14178 >  (eval $ac_try) 2>&5
14179 >  ac_status=$?
14180 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14181 >  (exit $ac_status); }; } &&
14182 >         { ac_try='test -s conftest$ac_exeext'
14183 >  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
14184 >  (eval $ac_try) 2>&5
14185 >  ac_status=$?
14186 >  echo "$as_me:$LINENO: \$? = $ac_status" >&5
14187 >  (exit $ac_status); }; }; then
14188 >  ac_cv_lib_Core_main=yes
14189 > else
14190 >  echo "$as_me: failed program was:" >&5
14191 > sed 's/^/| /' conftest.$ac_ext >&5
14192 >
14193 > ac_cv_lib_Core_main=no
14194   fi
14195 + rm -f conftest.err conftest.$ac_objext \
14196 +      conftest$ac_exeext conftest.$ac_ext
14197 + LIBS=$ac_check_lib_save_LIBS
14198 + fi
14199 + echo "$as_me:$LINENO: result: $ac_cv_lib_Core_main" >&5
14200 + echo "${ECHO_T}$ac_cv_lib_Core_main" >&6
14201 + if test $ac_cv_lib_Core_main = yes; then
14202 +  CGAL_LIBS="$CGAL_LIBS -lCore"
14203 + fi
14204  
14205 +        fi
14206 + fi
14207  
13957 – CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
14208  
13959 – CGAL_LIB_DIR=${CGAL_LIBDIR}
14209  
14210 < CGAL_RLIB_DIR=${CGAL_RLIBDIR}
14210 > echo "$as_me:$LINENO: checking CGAL" >&5
14211 > echo $ECHO_N "checking CGAL... $ECHO_C" >&6
14212 > if test "$acx_cgal_found" == yes; then
14213 >        echo "$as_me:$LINENO: result: yes" >&5
14214 > echo "${ECHO_T}yes" >&6;
14215 >
14216 > else
14217 >        echo "$as_me:$LINENO: result: no" >&5
14218 > echo "${ECHO_T}no" >&6
14219 >
14220 > fi
14221 >
14222 > if test "$acx_cgal_found" == yes; then
14223 >        USE_CGAL=yes
14224  
14225 + cat >>confdefs.h <<\_ACEOF
14226 + #define HAVE_CGAL 1
14227 + _ACEOF
14228  
14229  
14230  
14231  
14232  
14233 +
14234 + fi
14235 +
14236 +
14237 +
14238   # Check whether --enable-doxygen or --disable-doxygen was given.
14239   if test "${enable_doxygen+set}" = set; then
14240    enableval="$enable_doxygen"
# Line 14118 | Line 14388 | fi
14388  
14389  
14390  
14391 <                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
14391 >                                                  ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/math/Makefile src/applications/staticProps/Makefile scripts/filepp"
14392  
14393  
14394   cat >confcache <<\_ACEOF
# Line 14483 | Line 14753 | cat >&5 <<_CSEOF
14753   } >&5
14754   cat >&5 <<_CSEOF
14755  
14756 < This file was extended by OOPSE $as_me 3.0, which was
14756 > This file was extended by OOPSE $as_me 4.0, which was
14757   generated by GNU Autoconf 2.59.  Invocation command line was
14758  
14759    CONFIG_FILES    = $CONFIG_FILES
# Line 14546 | Line 14816 | ac_cs_version="\\
14816  
14817   cat >>$CONFIG_STATUS <<_ACEOF
14818   ac_cs_version="\\
14819 < OOPSE config.status 3.0
14819 > OOPSE config.status 4.0
14820   configured by $0, generated by GNU Autoconf 2.59,
14821    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
14822  
# Line 14651 | Line 14921 | do
14921    # Handling of arguments.
14922    "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
14923    "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
14924 <  "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
14924 >  "src/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/math/Makefile" ;;
14925 >  "src/applications/staticProps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/staticProps/Makefile" ;;
14926    "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
14927    "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
14928    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
# Line 14805 | Line 15076 | s,@USE_CGAL@,$USE_CGAL,;t t
15076   s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
15077   s,@USE_MPI@,$USE_MPI,;t t
15078   s,@USE_CGAL@,$USE_CGAL,;t t
15079 < s,@CGAL_INC_DIR@,$CGAL_INC_DIR,;t t
15080 < s,@CGAL_LIB_DIR@,$CGAL_LIB_DIR,;t t
15081 < s,@CGAL_RLIB_DIR@,$CGAL_RLIB_DIR,;t t
14811 < s,@CGAL_DEFINES@,$CGAL_DEFINES,;t t
14812 < s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
15079 > s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
15080 > s,@CGAL_LDFLAGS@,$CGAL_LDFLAGS,;t t
15081 > s,@CGAL_CPPFLAGS@,$CGAL_CPPFLAGS,;t t
15082   s,@CGAL_LIBS@,$CGAL_LIBS,;t t
15083   s,@DOXYGEN@,$DOXYGEN,;t t
15084   s,@DOT@,$DOT,;t t
# Line 15063 | Line 15332 | s,@INSTALL@,$ac_INSTALL,;t t
15332    case $ac_file in
15333      make/Makefile ) chmod 0755 scripts/* ;;
15334      src/utils/Makefile ) chmod 0755 scripts/* ;;
15335 <    src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
15335 >    src/math/Makefile ) chmod 0755 scripts/* ;;
15336 >    src/applications/staticProps/Makefile ) chmod 0755 scripts/* ;;
15337      scripts/filepp ) chmod 0755 scripts/* ;;
15338    esac
15339   done

Diff Legend

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