--- trunk/OOPSE-4/configure	2006/07/07 19:44:54	2926
+++ trunk/OOPSE-4/configure	2007/12/07 00:48:28	3292
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for OOPSE 3.0.
+# Generated by GNU Autoconf 2.59 for OOPSE 4.0.
 #
 # Report bugs to <gezelter@nd.edu>.
 #
@@ -269,8 +269,8 @@ PACKAGE_VERSION='3.0'
 # Identity of this package.
 PACKAGE_NAME='OOPSE'
 PACKAGE_TARNAME='oopse'
-PACKAGE_VERSION='3.0'
-PACKAGE_STRING='OOPSE 3.0'
+PACKAGE_VERSION='4.0'
+PACKAGE_STRING='OOPSE 4.0'
 PACKAGE_BUGREPORT='gezelter@nd.edu'
 
 ac_unique_file="src/applications/oopse/oopse.cpp"
@@ -312,7 +312,7 @@ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA
 # include <unistd.h>
 #endif"
 
-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'
+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'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -801,7 +801,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OOPSE 3.0 to adapt to many kinds of systems.
+\`configure' configures OOPSE 4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -862,7 +862,7 @@ if test -n "$ac_init_help"; then
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OOPSE 3.0:";;
+     short | recursive ) echo "Configuration of OOPSE 4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -887,8 +887,11 @@ Optional Packages:
                           to /usr/local or /usr if not found in /usr/local)
   --with-fftw=DIR         root directory path of fftw installation (defaults
                           to /usr/local or /usr if not found in /usr/local)
+  --with-qhull=DIR        root directory path of qhull installation (defaults
+                          to /usr/local or /usr if not found in /usr/local)
   --with-mpi=<prefix>     compile with MPI installed in <prefix> [default=no]
-  --with-cgal-makefile=FILE  CGAL makefile that should be used
+  --with-cgalmakefile=makefile
+                          Use the following CGAL makefile
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1003,7 +1006,7 @@ OOPSE configure 3.0
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-OOPSE configure 3.0
+OOPSE configure 4.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1017,7 +1020,7 @@ It was created by OOPSE $as_me 3.0, which was
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OOPSE $as_me 3.0, which was
+It was created by OOPSE $as_me 4.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1427,6 +1430,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This sho
 #
 #
 #
+
+
 
 
 
@@ -1439,6 +1444,30 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This sho
 # Figure out how the Fortran 90 compiler constructs module file names
 #
  # AC_F90_MODULE_NAMES
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1524,9 +1553,43 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This sho
 
 
 
+# This is taken from http://autoqt.sourceforge.net/
+# Copyright (c) 2002, Geoffrey Wossum
+# All rights reserved.
 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 
+#  - Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
 
+#  - Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+
+#  - Neither the name of Geoffrey Wossum nor the names of its
+#    contributors may be used to endorse or promote products derived from
+#    this software without specific prior written permission.
+
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+# Check for Qt compiler flags, linker flags, and binary packages
+
+
+
 # who am i
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
@@ -2809,7 +2872,7 @@ echo "$as_me:2812:" \
 
 
 # Provide some information about the compiler.
-echo "$as_me:2812:" \
+echo "$as_me:2875:" \
      "checking for Fortran compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -4057,7 +4120,7 @@ FCFLAGS="$FCFLAGS $ac_verb"
 # flags.
 ac_save_FFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_verb"
-(eval echo $as_me:4060: \"$ac_link\") >&5
+(eval echo $as_me:4123: \"$ac_link\") >&5
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FFLAGS
@@ -4135,7 +4198,7 @@ FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
 # flags.
 ac_save_FFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
-(eval echo $as_me:4138: \"$ac_link\") >&5
+(eval echo $as_me:4201: \"$ac_link\") >&5
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FFLAGS
@@ -4871,7 +4934,7 @@ FCFLAGS="$FCFLAGS $ac_verb"
 # flags.
 ac_save_FFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_verb"
-(eval echo $as_me:4874: \"$ac_link\") >&5
+(eval echo $as_me:4937: \"$ac_link\") >&5
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FFLAGS
@@ -4949,7 +5012,7 @@ FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
 # flags.
 ac_save_FFLAGS=$FCFLAGS
 FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
-(eval echo $as_me:4952: \"$ac_link\") >&5
+(eval echo $as_me:5015: \"$ac_link\") >&5
 ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$ac_fc_v_output" >&5
 FCFLAGS=$ac_save_FFLAGS
@@ -5843,24 +5906,22 @@ echo "$as_me: WARNING: Sorry, $zlib_dir does not exist
   else
     { echo "$as_me:$LINENO: WARNING: Sorry, $zlib_dir does not exist, checking usual places" >&5
 echo "$as_me: WARNING: Sorry, $zlib_dir does not exist, checking usual places" >&2;}
+	ZLIB_HOME=/usr/local
+	if test ! -f "${ZLIB_HOME}/include/zlib.h"
+	then
+        	ZLIB_HOME=/usr
+	fi
   fi
 fi
-
-ZLIB_HOME=/usr/local
-if test ! -f "${ZLIB_HOME}/include/zlib.h"
-then
-        ZLIB_HOME=/usr
-fi
-
 #
 # Locate zlib, if wanted
 #
 if test -n "${ZLIB_HOME}"
 then
         ZLIB_OLD_LDFLAGS=$LDFLAGS
-        ZLIB_OLD_CPPFLAGS=$LDFLAGS
+        ZLIB_OLD_CFLAGS=$CFLAGS
         LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-        CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+        CFLAGS="$CFLAGS -I${ZLIB_HOME}/include"
 
 
         ac_ext=c
@@ -6119,7 +6180,7 @@ echo $ECHO_N "checking zlib in ${ZLIB_HOME}... $ECHO_C
                 ZLIB_LIB_DIR=
                 ZLIB=
                 LDFLAGS="$ZLIB_OLD_LDFLAGS"
-                CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
+                CFLAGS="$ZLIB_OLD_CFLAGS"
                 echo "$as_me:$LINENO: result: failed" >&5
 echo "${ECHO_T}failed" >&6
 	        echo ""
@@ -6148,44 +6209,37 @@ else
   withval="$with_fftw"
   fftw_dir="$withval"
 else
-  		fftw_dir="not_set"
+  	     fftw_dir="not_set"
 fi;
 if test "$fftw_dir" != "no"; then
-
-if test "$fftw_dir" != "not_set" ; then
-  if test -d "$fftw_dir"
-  then
-    FFTW_HOME="$fftw_dir"
-  else
-    { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
+  if test "$fftw_dir" != "not_set" ; then
+    if test -d "$fftw_dir"; then
+      FFTW_HOME="$fftw_dir"
+    else
+      { echo "$as_me:$LINENO: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&5
 echo "$as_me: WARNING: Sorry, $fftw_dir does not exist, checking usual places" >&2;}
-  fi
-fi
-
-FFTW_HOME=/usr/local
-if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"
-then
+      FFTW_HOME=/usr/local
+      if test ! -f "${FFTW_HOME}/include/fftw3.h" -o -f "${FFTW_HOME}/include/fftw.h" -o  -f "${FFTW_HOME}/include/dfftw.h"; then
         FFTW_HOME=/usr
-fi
-
-#
-# Locate fftw, if wanted
-#
-if test -n "${FFTW_HOME}"
-then
-        FFTW_OLD_LDFLAGS=$LDFLAGS
-        FFTW_OLD_CPPFLAGS=$LDFLAGS
-        LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
-        CPPFLAGS="$CPPFLAGS -I${FFTW_HOME}/include"
+      fi
+    fi
+    #
+    # Locate fftw, if wanted
+    #
+    if test -n "${FFTW_HOME}"; then
+      FFTW_OLD_LDFLAGS=$LDFLAGS
+      FFTW_OLD_CFLAGS=$CFLAGS
+      LDFLAGS="$LDFLAGS -L${FFTW_HOME}/lib"
+      CFLAGS="$CFLAGS -I${FFTW_HOME}/include"
 
 
-        ac_ext=c
+      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-        echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
+      echo "$as_me:$LINENO: checking for fftw_execute in -lfftw3" >&5
 echo $ECHO_N "checking for fftw_execute in -lfftw3... $ECHO_C" >&6
 if test "${ac_cv_lib_fftw3_fftw_execute+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6263,7 +6317,7 @@ fi
   fftw_cv_libfftw3=no
 fi
 
-        if test "${ac_cv_header_fftw3_h+set}" = set; then
+      if test "${ac_cv_header_fftw3_h+set}" = set; then
   echo "$as_me:$LINENO: checking for fftw3.h" >&5
 echo $ECHO_N "checking for fftw3.h... $ECHO_C" >&6
 if test "${ac_cv_header_fftw3_h+set}" = set; then
@@ -6407,9 +6461,8 @@ fi
 fi
 
 
-        if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"
-        then
-                echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
+      if test "$fftw_cv_libfftw3" = "no" -o "$fftw_cv_fftw3_h" = "no"; then
+        echo "$as_me:$LINENO: checking for fftwnd_one in -lfftw" >&5
 echo $ECHO_N "checking for fftwnd_one in -lfftw... $ECHO_C" >&6
 if test "${ac_cv_lib_fftw_fftwnd_one+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6487,7 +6540,7 @@ fi
   fftw_cv_libfftw=no
 fi
 
-                if test "${ac_cv_header_fftw_h+set}" = set; then
+        if test "${ac_cv_header_fftw_h+set}" = set; then
   echo "$as_me:$LINENO: checking for fftw.h" >&5
 echo $ECHO_N "checking for fftw.h... $ECHO_C" >&6
 if test "${ac_cv_header_fftw_h+set}" = set; then
@@ -6631,9 +6684,8 @@ fi
 fi
 
 
-                if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"
-                then
-                        echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
+        if test "$fftw_cv_libfftw" = "no" -o "$fftw_cv_fftw_h" = "no"; then
+          echo "$as_me:$LINENO: checking for fftwnd_one in -ldfftw" >&5
 echo $ECHO_N "checking for fftwnd_one in -ldfftw... $ECHO_C" >&6
 if test "${ac_cv_lib_dfftw_fftwnd_one+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6711,7 +6763,7 @@ fi
   fftw_cv_libdfftw=no
 fi
 
-                        if test "${ac_cv_header_dfftw_h+set}" = set; then
+          if test "${ac_cv_header_dfftw_h+set}" = set; then
   echo "$as_me:$LINENO: checking for dfftw.h" >&5
 echo $ECHO_N "checking for dfftw.h... $ECHO_C" >&6
 if test "${ac_cv_header_dfftw_h+set}" = set; then
@@ -6855,78 +6907,391 @@ fi
 fi
 
 
-                fi
         fi
-        ac_ext=c
+      fi
+      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
-        if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"
-        then
+      if test "$fftw_cv_libfftw3" = "yes" -a "$fftw_cv_fftw3_h" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FFTW3_H 1
 _ACEOF
 
-                FFTW_INC_DIR="${FFTW_HOME}/include"
-                FFTW_LIB_DIR="${FFTW_HOME}/lib"
-                FFTW_LIBS="-lfftw3"
-        else
-        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"
-        then
+        FFTW_INC_DIR="${FFTW_HOME}/include"
+        FFTW_LIB_DIR="${FFTW_HOME}/lib"
+        FFTW_LIBS="-lfftw3"
+      else
+        if test "$fftw_cv_libfftw" = "yes" -a "$fftw_cv_fftw_h" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FFTW_H 1
 _ACEOF
 
-                FFTW_INC_DIR="${FFTW_HOME}/include"
-                FFTW_LIB_DIR="${FFTW_HOME}/lib"
-                FFTW_LIBS="-lfftw"
+          FFTW_INC_DIR="${FFTW_HOME}/include"
+          FFTW_LIB_DIR="${FFTW_HOME}/lib"
+          FFTW_LIBS="-lfftw"
         else
-        if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"
-        then
+          if test "$fftw_cv_libdfftw" = "yes" -a "$fftw_cv_dfftw_h" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_DFFTW_H 1
 _ACEOF
 
-                FFTW_INC_DIR="${FFTW_HOME}/include"
-                FFTW_LIB_DIR="${FFTW_HOME}/lib"
-                FFTW_LIBS="-ldfftw"
-        else
-                echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
+            FFTW_INC_DIR="${FFTW_HOME}/include"
+            FFTW_LIB_DIR="${FFTW_HOME}/lib"
+            FFTW_LIBS="-ldfftw"
+          else
+            echo "$as_me:$LINENO: checking fftw in ${FFTW_HOME}" >&5
 echo $ECHO_N "checking fftw in ${FFTW_HOME}... $ECHO_C" >&6
-                FFTW_INC_DIR=
-                FFTW_LIB_DIR=
-                FFTW_LIBS=
-                LDFLAGS="$FFTW_OLD_LDFLAGS"
-                CPPFLAGS="$FFTW_OLD_CPPFLAGS"
-                echo "$as_me:$LINENO: result: failed" >&5
+            FFTW_INC_DIR=
+            FFTW_LIB_DIR=
+            FFTW_LIBS=
+            LDFLAGS="$FFTW_OLD_LDFLAGS"
+            CFLAGS="$FFTW_OLD_CFLAGS"
+            echo "$as_me:$LINENO: result: failed" >&5
 echo "${ECHO_T}failed" >&6
-	echo ""
-	echo "*********************************************************"
-        echo "* WARNING: Could not find a working FFTW installation   *"
-        echo "* If you need the staticProps program to be able to     *"
-        echo "* compute undulation spectra, be sure to specify a      *"
-	echo "* valid fftw installation with --with-fftw=DIR          *"
-        echo "*                                                       *"
-        echo "* OOPSE will still work without fftw installed.         *"
-	echo "*********************************************************"
-	echo ""
+	    echo ""
+	    echo "*********************************************************"
+            echo "* WARNING: Could not find a working FFTW installation   *"
+            echo "* If you need the staticProps program to be able to     *"
+            echo "* compute undulation spectra, be sure to specify a      *"
+	    echo "* valid fftw installation with --with-fftw=DIR          *"
+            echo "*                                                       *"
+            echo "* OOPSE will still work without fftw installed.         *"
+	    echo "*********************************************************"
+	    echo ""
+          fi
         fi
-        fi
-        fi
+      fi
 
 
 
+    fi
+  fi
 fi
+
+#
+# Handle user hints
+#
+
+# Check whether --with-qhull or --without-qhull was given.
+if test "${with_qhull+set}" = set; then
+  withval="$with_qhull"
+  qhull_dir="$withval"
+else
+  		qhull_dir="not_set"
+fi;
+if test "$qhull_dir" != "no"; then
+
+if test "$qhull_dir" != "not_set" ; then
+  if test -d "$qhull_dir"
+  then
+    QHULL_HOME="$qhull_dir"
+  else
+    { echo "$as_me:$LINENO: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&5
+echo "$as_me: WARNING: Sorry, $qhull_dir does not exist, checking usual places" >&2;}
+	QHULL_HOME=/usr/local
+	if test ! -f "${QHULL_HOME}/include/qhull/qhull.h"
+	then
+		QHULL_HOME=/usr
+	fi
+  fi
 fi
+#
+# Locate qhull, if wanted
+#
+if test -n "${QHULL_HOME}"
+then
+        QHULL_OLD_LDFLAGS=$LDFLAGS
+        QHULL_OLD_CFLAGS=$CFLAGS
+        LDFLAGS="$LDFLAGS -L${QHULL_HOME}/lib"
+        CFLAGS="$CFLAGS -I${QHULL_HOME}/include"
 
 
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+        echo "$as_me:$LINENO: checking for qh_qhull in -lqhull" >&5
+echo $ECHO_N "checking for qh_qhull in -lqhull... $ECHO_C" >&6
+if test "${ac_cv_lib_qhull_qh_qhull+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lqhull  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char qh_qhull ();
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+qh_qhull ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_qhull_qh_qhull=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_qhull_qh_qhull=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_qhull_qh_qhull" >&5
+echo "${ECHO_T}$ac_cv_lib_qhull_qh_qhull" >&6
+if test $ac_cv_lib_qhull_qh_qhull = yes; then
+  qhull_cv_libqhull=yes
+else
+  qhull_cv_libqhull=no
+fi
+
+        if test "${ac_cv_header_qhull_qhull_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for qhull/qhull.h" >&5
+echo $ECHO_N "checking for qhull/qhull.h... $ECHO_C" >&6
+if test "${ac_cv_header_qhull_qhull_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_qhull_qhull_h" >&5
+echo "${ECHO_T}$ac_cv_header_qhull_qhull_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking qhull/qhull.h usability" >&5
+echo $ECHO_N "checking qhull/qhull.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <qhull/qhull.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking qhull/qhull.h presence" >&5
+echo $ECHO_N "checking qhull/qhull.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <qhull/qhull.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: qhull/qhull.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: qhull/qhull.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: qhull/qhull.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: qhull/qhull.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: qhull/qhull.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: qhull/qhull.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: qhull/qhull.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: qhull/qhull.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: qhull/qhull.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------ ##
+## Report this to gezelter@nd.edu ##
+## ------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for qhull/qhull.h" >&5
+echo $ECHO_N "checking for qhull/qhull.h... $ECHO_C" >&6
+if test "${ac_cv_header_qhull_qhull_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_qhull_qhull_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_qhull_qhull_h" >&5
+echo "${ECHO_T}$ac_cv_header_qhull_qhull_h" >&6
+
+fi
+if test $ac_cv_header_qhull_qhull_h = yes; then
+  qhull_cv_qhull_h=yes
+else
+  qhull_cv_qhull_h=no
+fi
+
+
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+        if test "$qhull_cv_libqhull" = "yes" -a "$qhull_cv_qhull_h" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_QHULL_H 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_QHULL 1
+_ACEOF
+
+                USE_QHULL=yes
+                QHULL_INC_DIR="${QHULL_HOME}/include"
+                QHULL_LIB_DIR="${QHULL_HOME}/lib"
+                QHULL="-lqhull"
+        else
+                echo "$as_me:$LINENO: checking qhull in ${QHULL_HOME}" >&5
+echo $ECHO_N "checking qhull in ${QHULL_HOME}... $ECHO_C" >&6
+                QHULL_INC_DIR=
+                QHULL_LIB_DIR=
+                QHULL=
+                USE_QHULL=no
+                LDFLAGS="$QHULL_OLD_LDFLAGS"
+                CFLAGS="$QHULL_OLD_CFLAGS"
+                echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6
+	        echo ""
+	        echo "*********************************************************"
+                echo "* WARNING: Could not find a working qhull installation  *"
+                echo "* If you need OOPSE to be able to deal with convex      *"
+                echo "* hulls be sure to specify a valid qhull installation   *"
+	        echo "* with --with-qhull=DIR                                 *"
+                echo "*                                                       *"
+                echo "* OOPSE will still work without qhull installed.        *"
+	        echo "*********************************************************"
+	        echo ""
+        fi
+
+
+
+
+fi
+fi
+
+
 # Checks for header files.
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -11941,7 +12306,7 @@ if test "$ac_test_FFLAGS" != "set"; then
   case "${host_cpu}-${host_os}" in
 
   *linux*) if test "$FC" = ifc -o "$FC" = ifort; then
-                    FCFLAGS="-O3 -ip -no-prec-div -cxxlib-icc"
+                    FCFLAGS="-O3 -ip -no-prec-div"
                 fi;;
    rs6000*-aix*)  if test "$FC" = xlf90 -o "$FC" = f90 -o "$FC" = xlf95; then
                     FCFLAGS="-O3 -qarch=pwrx -qtune=pwrx -qansialias -w"
@@ -13511,123 +13876,80 @@ USE_CGAL=no
 
 
 
-USE_CGAL=no
-cgal_makefile=auto
+acx_cgal_found=no
 
-# Check whether --with-cgal-makefile or --without-cgal-makefile was given.
-if test "${with_cgal_makefile+set}" = set; then
-  withval="$with_cgal_makefile"
-  cgal_makefile="$withval"
+# Check whether --with-cgalmakefile or --without-cgalmakefile was given.
+if test "${with_cgalmakefile+set}" = set; then
+  withval="$with_cgalmakefile"
+
 fi;
+case $with_cgalmakefile in
+        yes | "") ;;
+        no) acx_cgal_found=disable ;;
+        -* | */* | *.a | *.so | *.so.* | *.o) CGAL_MAKEFILE="$with_cgalmakefile" ;;
+        *) CGAL_MAKEFILE="$with_cgalmakefile" ;;
+esac
 
-if test "x$cgal_makefile" != xno; then
+if test "$acx_cgal_found" == no; then
+    echo "$as_me:$LINENO: checking CGAL_MAKEFILE" >&5
+echo $ECHO_N "checking CGAL_MAKEFILE... $ECHO_C" >&6
 
-  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
-    cgal_makefile="$CGAL_MAKEFILE"
-  fi
+    if test \! -z "$CGAL_MAKEFILE"; then
 
-  echo "$as_me:$LINENO: checking for cgal_makefile: $cgal_makefile" >&5
-echo $ECHO_N "checking for cgal_makefile: $cgal_makefile... $ECHO_C" >&6
+	if test -e "$CGAL_MAKEFILE"; then
+	    tname=`mktemp /tmp/cgal_makefile_dsrXXXXXX`
 
-  if test -f "$cgal_makefile"; then
+cat > $tname << _ACEOF
+include $CGAL_MAKEFILE
 
-    cat >config.tmp.Makefile <<EOF
-include $cgal_makefile
-default:
-	@echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
-	@echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
-	@echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
-	@echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
-	@echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
-	@echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
-	@echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
-	@echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
-	@echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
-	@echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
-	@echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
-	@echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
-EOF
+cppflags:
+	@echo \$(CGAL_CXXFLAGS)
 
-    make -s -f config.tmp.Makefile
-    . config.tmp.cgalvariables
-
-    rm -f config.tmp.Makefile config.tmp.cgalvariables
-
-    if test "x$CGAL_INCLDIR" = "x"; then
-      CGAL_INCLDIR=""
+cxxflags:
+	@echo
+ldflags:
+	@echo \$(CGAL_LDFLAGS)
+_ACEOF
+	    CGAL_CPPFLAGS="`make -s -f $tname cppflags`"
+	    CGAL_CXXFLAGS="`make -s -f $tname cxxflags`"
+	    CGAL_LDFLAGST="`make -s -f $tname ldflags`"
+	    for i in $CGAL_LDFLAGST; do
+		if test `echo $i| grep -c ^-l`; then
+		    CGAL_LIBS="$CGAL_LIBS $i"
+		else
+		    CGAL_LDFLAGS="$CGAL_LDFLAGS $i"
+		fi
+	    done
+	    rm -f $tname
+	    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	    acx_cgal_found=yes
+	   	   	           else
+	    echo "$as_me:$LINENO: result: invalid" >&5
+echo "${ECHO_T}invalid" >&6
+ 	    { { echo "$as_me:$LINENO: error: CGAL_MAKEFILE defined, but the makefile does not exist." >&5
+echo "$as_me: error: CGAL_MAKEFILE defined, but the makefile does not exist." >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+    else
+	echo "$as_me:$LINENO: result: not defined" >&5
+echo "${ECHO_T}not defined" >&6
     fi
+fi
 
-    if test "x$CGAL_LIBDIR" = "x"; then
-      CGAL_LIBDIR=""
-    fi
-
-    if test "x$CGAL_RLIBDIR" = "x"; then
-      CGAL_RLIBDIR=""
-    fi
-
-    if test "x$LEDA_INCLDIR" = "x"; then
-      LEDA_INCLDIR=""
-    fi
-
-    if test "x$LEDA_LIBDIR" = "x"; then
-      LEDA_LIBDIR=""
-    fi
-
-    if test "x$LEDA_RLIBDIR" = "x"; then
-      LEDA_RLIBDIR=""
-    fi
-
-    if test "x$GMP_INCLDIR" = "x"; then
-      GMP_INCLDIR=""
-    fi
-
-    if test "x$GMP_LIBDIR" = "x"; then
-      GMP_LIBDIR=""
-    fi
-
-    if test "x$GMP_RLIBDIR" = "x"; then
-      GMP_RLIBDIR=""
-    fi
-
-    echo "$as_me:$LINENO: result: CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&5
-echo "${ECHO_T}CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&6
-    echo "$as_me:$LINENO: result: CGAL_INCLDIR=       $CGAL_INCLDIR" >&5
-echo "${ECHO_T}CGAL_INCLDIR=       $CGAL_INCLDIR" >&6
-    echo "$as_me:$LINENO: result: CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&5
-echo "${ECHO_T}CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&6
-    echo "$as_me:$LINENO: result: CGAL_LIBDIR=        $CGAL_LIBDIR" >&5
-echo "${ECHO_T}CGAL_LIBDIR=        $CGAL_LIBDIR" >&6
-    echo "$as_me:$LINENO: result: CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&5
-echo "${ECHO_T}CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&6
-    echo "$as_me:$LINENO: result: LEDA_INCLDIR=       $LEDA_INCLDIR" >&5
-echo "${ECHO_T}LEDA_INCLDIR=       $LEDA_INCLDIR" >&6
-    echo "$as_me:$LINENO: result: LEDA_LIBDIR=        $LEDA_LIBDIR" >&5
-echo "${ECHO_T}LEDA_LIBDIR=        $LEDA_LIBDIR" >&6
-    echo "$as_me:$LINENO: result: GMP_INCLDIR=        $GMP_INCLDIR" >&5
-echo "${ECHO_T}GMP_INCLDIR=        $GMP_INCLDIR" >&6
-    echo "$as_me:$LINENO: result: GMP_LIBDIR=         $GMP_LIBDIR" >&5
-echo "${ECHO_T}GMP_LIBDIR=         $GMP_LIBDIR" >&6
-
-    ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
-    if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
-echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
-if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
+if test "$acx_cgal_found" == no; then
+	if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for CGAL/Exact_predicates_inexact_constructions_kernel.h" >&5
+echo $ECHO_N "checking for CGAL/Exact_predicates_inexact_constructions_kernel.h... $ECHO_C" >&6
+if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
-echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&5
+echo "${ECHO_T}$ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&6
 else
   # Is the header compilable?
-echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5
-echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking CGAL/Exact_predicates_inexact_constructions_kernel.h usability" >&5
+echo $ECHO_N "checking CGAL/Exact_predicates_inexact_constructions_kernel.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13635,7 +13957,7 @@ $ac_includes_default
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <CGAL/Cartesian.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -13646,7 +13968,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
+	 { ac_try='test -z "$ac_c_werror_flag"
 			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -13671,15 +13993,15 @@ echo "$as_me:$LINENO: checking CGAL/Cartesian.h presen
 echo "${ECHO_T}$ac_header_compiler" >&6
 
 # Is the header present?
-echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5
-echo $ECHO_N "checking CGAL/Cartesian.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking CGAL/Exact_predicates_inexact_constructions_kernel.h presence" >&5
+echo $ECHO_N "checking CGAL/Exact_predicates_inexact_constructions_kernel.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <CGAL/Cartesian.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -13690,8 +14012,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$a
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -13711,27 +14033,27 @@ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_pr
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: CGAL/Exact_predicates_inexact_constructions_kernel.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
 ## ------------------------------ ##
@@ -13742,108 +14064,105 @@ echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >
       sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
-echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
-if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
+echo "$as_me:$LINENO: checking for CGAL/Exact_predicates_inexact_constructions_kernel.h" >&5
+echo $ECHO_N "checking for CGAL/Exact_predicates_inexact_constructions_kernel.h... $ECHO_C" >&6
+if test "${ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc
+  ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h=$ac_header_preproc
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
-echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&5
+echo "${ECHO_T}$ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h" >&6
 
 fi
-if test $ac_cv_header_CGAL_Cartesian_h = yes; then
-  cgal=yes
+if test $ac_cv_header_CGAL_Exact_predicates_inexact_constructions_kernel_h = yes; then
+  cgal_have_header=yes
 else
-  cgal=no
+  cgal_have_header=no
 fi
 
 
-    CXXFLAGS="$save_CXXFLAGS"
+	if test "$cgal_have_header" == yes; then
+		echo "$as_me:$LINENO: checking for main in -lCGAL" >&5
+echo $ECHO_N "checking for main in -lCGAL... $ECHO_C" >&6
+if test "${ac_cv_lib_CGAL_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lCGAL  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-    if test "x$cgal" = xyes; then
-      echo "$as_me:$LINENO: checking for CGAL version" >&5
-echo $ECHO_N "checking for CGAL version... $ECHO_C" >&6
-      LOCATION=${CGAL_INCLDIR}
-      LOCATION=${LOCATION:-/usr/include}
-      if test -f $LOCATION/CGAL/version.h; then
-        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
-      else
-        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
-      fi
-      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
-        echo "$as_me:$LINENO: result: ($CGAL_VERSION) yes" >&5
-echo "${ECHO_T}($CGAL_VERSION) yes" >&6
-      else
-        echo "$as_me:$LINENO: result: ($CGAL_VERSION) no" >&5
-echo "${ECHO_T}($CGAL_VERSION) no" >&6
-        cgal=no
-      fi
-    fi
 
-    if test "x$cgal" = xyes; then
-      CGAL_LIBS="-lCGAL"
-      echo "$as_me:$LINENO: checking whether CGAL uses LEDA" >&5
-echo $ECHO_N "checking whether CGAL uses LEDA... $ECHO_C" >&6
-      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
-        CGAL_USES_LEDA=yes
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
-      else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-        CGAL_USES_LEDA=no
-      fi
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_CGAL_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-      echo "$as_me:$LINENO: checking whether CGAL uses GMP" >&5
-echo $ECHO_N "checking whether CGAL uses GMP... $ECHO_C" >&6
-      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
-        CGAL_USES_GMP=yes
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
-      else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-        CGAL_USES_GMP=no
-      fi
+ac_cv_lib_CGAL_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_CGAL_main" >&5
+echo "${ECHO_T}$ac_cv_lib_CGAL_main" >&6
+if test $ac_cv_lib_CGAL_main = yes; then
+  cgal_have_lib=yes
+else
+  cgal_have_lib=no
+fi
 
-      CGAL_LIBS="$CGAL_LIBS -lm"
-
-      CGAL_CXXFLAGS="-ftemplate-depth-50"
-
-      echo "$as_me:$LINENO: result: CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&5
-echo "${ECHO_T}CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&6
-      echo "$as_me:$LINENO: result: CGAL_USES_GMP =     $CGAL_USES_GMP" >&5
-echo "${ECHO_T}CGAL_USES_GMP =     $CGAL_USES_GMP" >&6
-      echo "$as_me:$LINENO: result: CGAL_INCLDIR  =     $CGAL_INCLDIR" >&5
-echo "${ECHO_T}CGAL_INCLDIR  =     $CGAL_INCLDIR" >&6
-      echo "$as_me:$LINENO: result: CGAL_LIBDIR   =     $CGAL_LIBDIR" >&5
-echo "${ECHO_T}CGAL_LIBDIR   =     $CGAL_LIBDIR" >&6
-      echo "$as_me:$LINENO: result: CGAL_DEFINES  =     $CGAL_DEFINES" >&5
-echo "${ECHO_T}CGAL_DEFINES  =     $CGAL_DEFINES" >&6
-      echo "$as_me:$LINENO: result: CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&5
-echo "${ECHO_T}CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&6
-      echo "$as_me:$LINENO: result: CGAL_LIBS     =     $CGAL_LIBS" >&5
-echo "${ECHO_T}CGAL_LIBS     =     $CGAL_LIBS" >&6
-    fi
-
-    if test "x$cgal" = xyes; then
-      save_LIBS="$LIBS"
-      LIBS="$LIBS -L$CGAL_LIBDIR"
-      if test "x$CGAL_USES_LEDA" = xyes; then
-        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
-      fi
-      # if test "x$CGAL_USES_GMP" = xyes; then
-      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
-      # fi
-      echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
-echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
-save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
-save_LIBS_CHECK_CXX_LIB="$LIBS"
+		if test "$cgal_have_lib" == no; then
+			save_LIBS="$LIBS"; LIBS="$LIBS -lgmp -lmpfr -lm"
+        		echo "$as_me:$LINENO: checking for main in -lCGAL" >&5
+echo $ECHO_N "checking for main in -lCGAL... $ECHO_C" >&6
+if test "${ac_cv_lib_CGAL_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lCGAL  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13851,7 +14170,8 @@ cat >>conftest.$ac_ext <<_ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <CGAL/Cartesian.h>
+
+
 #ifdef FC_DUMMY_MAIN
 #ifndef FC_DUMMY_MAIN_EQ_F77
 #  ifdef __cplusplus
@@ -13863,7 +14183,7 @@ main ()
 int
 main ()
 {
-::CGAL::Cartesian<int>::Point_2 P
+main ();
   ;
   return 0;
 }
@@ -13877,7 +14197,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
+	 { ac_try='test -z "$ac_c_werror_flag"
 			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -13890,81 +14210,349 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-cgal=yes
+  ac_cv_lib_CGAL_main=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-cgal=no
+ac_cv_lib_CGAL_main=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB"
-LIBS="$save_LIBS_CHECK_CXX_LIB"
-      LIBS="$save_LIBS"
-    fi
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_CGAL_main" >&5
+echo "${ECHO_T}$ac_cv_lib_CGAL_main" >&6
+if test $ac_cv_lib_CGAL_main = yes; then
+  CGAL_LIBS="-lCGAL -lgmp -lmpfr"
+						  cgal_have_lib=yes
+else
+  cgal_have_lib=no
+fi
 
-  fi
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+        		LIBS="$save_LIBS"
+		else
+			CGAL_LIBS="-lCGAL"
+			echo "$as_me:$LINENO: checking for main in -lmpfr" >&5
+echo $ECHO_N "checking for main in -lmpfr... $ECHO_C" >&6
+if test "${ac_cv_lib_mpfr_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmpfr  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_mpfr_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-
+ac_cv_lib_mpfr_main=no
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mpfr_main" >&5
+echo "${ECHO_T}$ac_cv_lib_mpfr_main" >&6
+if test $ac_cv_lib_mpfr_main = yes; then
+  CGAL_LIBS="$CGAL_LIBS -lmpfr"
+fi
 
-if test "x$cgal" = xyes; then
-  USE_CGAL=yes
+			echo "$as_me:$LINENO: checking for main in -lgmp" >&5
+echo $ECHO_N "checking for main in -lgmp... $ECHO_C" >&6
+if test "${ac_cv_lib_gmp_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgmp  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CGAL 1
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_gmp_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_lib_gmp_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_main" >&5
+echo "${ECHO_T}$ac_cv_lib_gmp_main" >&6
+if test $ac_cv_lib_gmp_main = yes; then
+  CGAL_LIBS="$CGAL_LIBS -lgmp"
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define CGAL_VERSION $CGAL_VERSION
+			echo "$as_me:$LINENO: checking for main in -lgmpxx" >&5
+echo $ECHO_N "checking for main in -lgmpxx... $ECHO_C" >&6
+if test "${ac_cv_lib_gmpxx_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgmpxx  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
-    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
-echo "$as_me: WARNING: *****************************************************" >&2;}
-    { echo "$as_me:$LINENO: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&5
-echo "$as_me: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&2;}
-    { echo "$as_me:$LINENO: WARNING: *** supported versions. It may still work though. ***" >&5
-echo "$as_me: WARNING: *** supported versions. It may still work though. ***" >&2;}
-    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
-echo "$as_me: WARNING: *****************************************************" >&2;}
-  fi
+
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_gmpxx_main=yes
 else
-   if test "x$cgal_makefile" != xno; then
-    echo "$as_me:$LINENO: result: No CGAL support. These are not the droids you want." >&5
-echo "${ECHO_T}No CGAL support. These are not the droids you want." >&6
-  fi
-  CGAL_INCLDIR=
-  CGAL_LIBDIR=
-  CGAL_RLIBDIR=
-  CGAL_DEFINES=
-  CGAL_CXXFLAGS=
-  CGAL_LIBS=
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_gmpxx_main=no
 fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_gmpxx_main" >&5
+echo "${ECHO_T}$ac_cv_lib_gmpxx_main" >&6
+if test $ac_cv_lib_gmpxx_main = yes; then
+  CGAL_LIBS="$CGAL_LIBS -lgmpxx"
+fi
 
+		fi
 
-CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
+		if test "$cgal_have_lib" == yes; then
+			acx_cgal_found=yes
+		fi
+	fi
+	if test "$acx_cgal_found" == yes; then
+		echo "$as_me:$LINENO: checking for main in -lCore" >&5
+echo $ECHO_N "checking for main in -lCore... $ECHO_C" >&6
+if test "${ac_cv_lib_Core_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lCore  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-CGAL_LIB_DIR=${CGAL_LIBDIR}
 
-CGAL_RLIB_DIR=${CGAL_RLIBDIR}
+#ifdef FC_DUMMY_MAIN
+#ifndef FC_DUMMY_MAIN_EQ_F77
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int FC_DUMMY_MAIN() { return 1; }
+#endif
+#endif
+int
+main ()
+{
+main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Core_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Core_main=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_Core_main" >&5
+echo "${ECHO_T}$ac_cv_lib_Core_main" >&6
+if test $ac_cv_lib_Core_main = yes; then
+  CGAL_LIBS="$CGAL_LIBS -lCore"
+fi
+
+	fi
+fi
+
+
+
+echo "$as_me:$LINENO: checking CGAL" >&5
+echo $ECHO_N "checking CGAL... $ECHO_C" >&6
+if test "$acx_cgal_found" == yes; then
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6;
 
+else
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 
+fi
+USE_CGAL=no
+if test "$acx_cgal_found" == yes; then
+	USE_CGAL=yes
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CGAL 1
+_ACEOF
 
 
 
+
+
+fi
+
+
+
+
 # Check whether --enable-doxygen or --disable-doxygen was given.
 if test "${enable_doxygen+set}" = set; then
   enableval="$enable_doxygen"
@@ -14118,7 +14706,7 @@ fi
 
 
 
-                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
+                                        ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/math/Makefile scripts/filepp"
 
 
 cat >confcache <<\_ACEOF
@@ -14483,7 +15071,7 @@ This file was extended by OOPSE $as_me 3.0, which was
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by OOPSE $as_me 3.0, which was
+This file was extended by OOPSE $as_me 4.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14546,7 +15134,7 @@ OOPSE config.status 3.0
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OOPSE config.status 3.0
+OOPSE config.status 4.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -14651,7 +15239,7 @@ do
   # Handling of arguments.
   "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
   "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
-  "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
+  "src/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/math/Makefile" ;;
   "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
   "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
@@ -14794,6 +15382,10 @@ s,@LIBOBJS@,$LIBOBJS,;t t
 s,@FFTW_INC_DIR@,$FFTW_INC_DIR,;t t
 s,@FFTW_LIB_DIR@,$FFTW_LIB_DIR,;t t
 s,@FFTW_LIBS@,$FFTW_LIBS,;t t
+s,@QHULL_INC_DIR@,$QHULL_INC_DIR,;t t
+s,@QHULL_LIB_DIR@,$QHULL_LIB_DIR,;t t
+s,@QHULL@,$QHULL,;t t
+s,@USE_QHULL@,$USE_QHULL,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@POW_LIB@,$POW_LIB,;t t
 s,@CXXCPP@,$CXXCPP,;t t
@@ -14804,13 +15396,11 @@ s,@USE_CGAL@,$USE_CGAL,;t t
 s,@MPI_LIB@,$MPI_LIB,;t t
 s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
 s,@USE_MPI@,$USE_MPI,;t t
-s,@USE_CGAL@,$USE_CGAL,;t t
-s,@CGAL_INC_DIR@,$CGAL_INC_DIR,;t t
-s,@CGAL_LIB_DIR@,$CGAL_LIB_DIR,;t t
-s,@CGAL_RLIB_DIR@,$CGAL_RLIB_DIR,;t t
-s,@CGAL_DEFINES@,$CGAL_DEFINES,;t t
 s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
+s,@CGAL_LDFLAGS@,$CGAL_LDFLAGS,;t t
+s,@CGAL_CPPFLAGS@,$CGAL_CPPFLAGS,;t t
 s,@CGAL_LIBS@,$CGAL_LIBS,;t t
+s,@USE_CGAL@,$USE_CGAL,;t t
 s,@DOXYGEN@,$DOXYGEN,;t t
 s,@DOT@,$DOT,;t t
 s,@DOC@,$DOC,;t t
@@ -15063,7 +15653,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
   case $ac_file in
     make/Makefile ) chmod 0755 scripts/* ;;
     src/utils/Makefile ) chmod 0755 scripts/* ;;
-    src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
+    src/math/Makefile ) chmod 0755 scripts/* ;;
     scripts/filepp ) chmod 0755 scripts/* ;;
   esac
 done