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

Comparing trunk/configure (file contents):
Revision 1036 by gezelter, Mon Sep 4 13:37:15 2006 UTC vs.
Revision 1137 by chuckv, Tue May 29 22:50:14 2007 UTC

# 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 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 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  
892   Some influential environment variables:
893    CXX         C++ compiler command
# Line 2809 | Line 2808 | fi
2808  
2809  
2810   # Provide some information about the compiler.
2811 < echo "$as_me:2812:" \
2811 > echo "$as_me:2811:" \
2812       "checking for Fortran compiler version" >&5
2813   ac_compiler=`set X $ac_compile; echo $2`
2814   { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
# Line 4057 | Line 4056 | FCFLAGS="$FCFLAGS $ac_verb"
4056   # flags.
4057   ac_save_FFLAGS=$FCFLAGS
4058   FCFLAGS="$FCFLAGS $ac_verb"
4059 < (eval echo $as_me:4060: \"$ac_link\") >&5
4059 > (eval echo $as_me:4059: \"$ac_link\") >&5
4060   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4061   echo "$ac_fc_v_output" >&5
4062   FCFLAGS=$ac_save_FFLAGS
# Line 4135 | Line 4134 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4134   # flags.
4135   ac_save_FFLAGS=$FCFLAGS
4136   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4137 < (eval echo $as_me:4138: \"$ac_link\") >&5
4137 > (eval echo $as_me:4137: \"$ac_link\") >&5
4138   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4139   echo "$ac_fc_v_output" >&5
4140   FCFLAGS=$ac_save_FFLAGS
# Line 4871 | Line 4870 | FCFLAGS="$FCFLAGS $ac_verb"
4870   # flags.
4871   ac_save_FFLAGS=$FCFLAGS
4872   FCFLAGS="$FCFLAGS $ac_verb"
4873 < (eval echo $as_me:4874: \"$ac_link\") >&5
4873 > (eval echo $as_me:4873: \"$ac_link\") >&5
4874   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4875   echo "$ac_fc_v_output" >&5
4876   FCFLAGS=$ac_save_FFLAGS
# Line 4949 | Line 4948 | FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4948   # flags.
4949   ac_save_FFLAGS=$FCFLAGS
4950   FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
4951 < (eval echo $as_me:4952: \"$ac_link\") >&5
4951 > (eval echo $as_me:4951: \"$ac_link\") >&5
4952   ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
4953   echo "$ac_fc_v_output" >&5
4954   FCFLAGS=$ac_save_FFLAGS
# Line 13493 | Line 13492 | echo "${ECHO_T}found $MPI_F90_LIB" >&6
13492   fi
13493   echo "$as_me:$LINENO: result: found $MPI_F90_LIB" >&5
13494   echo "${ECHO_T}found $MPI_F90_LIB" >&6
13496
13497
13498 fi
13499
13500
13501
13502 USE_CGAL=no
13503 cgal_makefile=auto
13504
13505 # Check whether --with-cgal-makefile or --without-cgal-makefile was given.
13506 if test "${with_cgal_makefile+set}" = set; then
13507  withval="$with_cgal_makefile"
13508  cgal_makefile="$withval"
13509 fi;
13510
13511 if test "x$cgal_makefile" != xno; then
13512
13513  if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then
13514    cgal_makefile="$CGAL_MAKEFILE"
13515  fi
13516
13517  echo "$as_me:$LINENO: checking for cgal_makefile: $cgal_makefile" >&5
13518 echo $ECHO_N "checking for cgal_makefile: $cgal_makefile... $ECHO_C" >&6
13519
13520  if test -f "$cgal_makefile"; then
13521
13522    cat >config.tmp.Makefile <<EOF
13523 include $cgal_makefile
13524 default:
13525        @echo CGAL_OS_COMPILER=\"\${CGAL_OS_COMPILER}\" >config.tmp.cgalvariables
13526        @echo CGAL_INCLDIR=\"\${CGAL_INCL_DIR}\" >>config.tmp.cgalvariables
13527        @echo CGAL_INCLCONFDIR=\"\${CGAL_INCL_CONF_DIR}\" >>config.tmp.cgalvariables
13528        @echo CGAL_LIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
13529        @echo CGAL_RLIBDIR=\"\${CGAL_LIB_DIR}/\${CGAL_OS_COMPILER}\" >>config.tmp.cgalvariables
13530        @echo CGAL_CXXFLAGS=\"\${CGAL_CXXFLAGS}\" >>config.tmp.cgalvariables
13531        @echo GMP_INCLDIR=\"\${GMP_INCL_DIR}\" >>config.tmp.cgalvariables
13532        @echo GMP_LIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
13533        @echo GMP_RLIBDIR=\"\${GMP_LIB_DIR}\" >>config.tmp.cgalvariables
13534        @echo LEDA_INCLDIR=\"\${LEDA_INCL_DIR}\" >>config.tmp.cgalvariables
13535        @echo LEDA_LIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
13536        @echo LEDA_RLIBDIR=\"\${LEDA_LIB_DIR}\" >>config.tmp.cgalvariables
13537 EOF
13538
13539    make -s -f config.tmp.Makefile
13540    . config.tmp.cgalvariables
13541
13542    rm -f config.tmp.Makefile config.tmp.cgalvariables
13543
13544    if test "x$CGAL_INCLDIR" = "x"; then
13545      CGAL_INCLDIR=""
13546    fi
13495  
13548    if test "x$CGAL_LIBDIR" = "x"; then
13549      CGAL_LIBDIR=""
13550    fi
13551
13552    if test "x$CGAL_RLIBDIR" = "x"; then
13553      CGAL_RLIBDIR=""
13554    fi
13555
13556    if test "x$LEDA_INCLDIR" = "x"; then
13557      LEDA_INCLDIR=""
13558    fi
13559
13560    if test "x$LEDA_LIBDIR" = "x"; then
13561      LEDA_LIBDIR=""
13562    fi
13563
13564    if test "x$LEDA_RLIBDIR" = "x"; then
13565      LEDA_RLIBDIR=""
13566    fi
13567
13568    if test "x$GMP_INCLDIR" = "x"; then
13569      GMP_INCLDIR=""
13570    fi
13571
13572    if test "x$GMP_LIBDIR" = "x"; then
13573      GMP_LIBDIR=""
13574    fi
13575
13576    if test "x$GMP_RLIBDIR" = "x"; then
13577      GMP_RLIBDIR=""
13578    fi
13579
13580    echo "$as_me:$LINENO: result: CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&5
13581 echo "${ECHO_T}CGAL_OS_COMPILER=   $CGAL_OS_COMPILER" >&6
13582    echo "$as_me:$LINENO: result: CGAL_INCLDIR=       $CGAL_INCLDIR" >&5
13583 echo "${ECHO_T}CGAL_INCLDIR=       $CGAL_INCLDIR" >&6
13584    echo "$as_me:$LINENO: result: CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&5
13585 echo "${ECHO_T}CGAL_INCLCONFDIR=   $CGAL_INCLCONFDIR" >&6
13586    echo "$as_me:$LINENO: result: CGAL_LIBDIR=        $CGAL_LIBDIR" >&5
13587 echo "${ECHO_T}CGAL_LIBDIR=        $CGAL_LIBDIR" >&6
13588    echo "$as_me:$LINENO: result: CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&5
13589 echo "${ECHO_T}CGAL_CXXFLAGS=      $CGAL_CXXFLAGS" >&6
13590    echo "$as_me:$LINENO: result: LEDA_INCLDIR=       $LEDA_INCLDIR" >&5
13591 echo "${ECHO_T}LEDA_INCLDIR=       $LEDA_INCLDIR" >&6
13592    echo "$as_me:$LINENO: result: LEDA_LIBDIR=        $LEDA_LIBDIR" >&5
13593 echo "${ECHO_T}LEDA_LIBDIR=        $LEDA_LIBDIR" >&6
13594    echo "$as_me:$LINENO: result: GMP_INCLDIR=        $GMP_INCLDIR" >&5
13595 echo "${ECHO_T}GMP_INCLDIR=        $GMP_INCLDIR" >&6
13596    echo "$as_me:$LINENO: result: GMP_LIBDIR=         $GMP_LIBDIR" >&5
13597 echo "${ECHO_T}GMP_LIBDIR=         $GMP_LIBDIR" >&6
13598
13599    ac_ext=cc
13600 ac_cpp='$CXXCPP $CPPFLAGS'
13601 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13602 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13603 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
13496  
13605    save_CXXFLAGS="$CXXFLAGS"
13606    CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13607    if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13608  echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
13609 echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
13610 if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13611  echo $ECHO_N "(cached) $ECHO_C" >&6
13497   fi
13613 echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
13614 echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
13615 else
13616  # Is the header compilable?
13617 echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5
13618 echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6
13619 cat >conftest.$ac_ext <<_ACEOF
13620 /* confdefs.h.  */
13621 _ACEOF
13622 cat confdefs.h >>conftest.$ac_ext
13623 cat >>conftest.$ac_ext <<_ACEOF
13624 /* end confdefs.h.  */
13625 $ac_includes_default
13626 #include <CGAL/Cartesian.h>
13627 _ACEOF
13628 rm -f conftest.$ac_objext
13629 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13630  (eval $ac_compile) 2>conftest.er1
13631  ac_status=$?
13632  grep -v '^ *+' conftest.er1 >conftest.err
13633  rm -f conftest.er1
13634  cat conftest.err >&5
13635  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13636  (exit $ac_status); } &&
13637         { ac_try='test -z "$ac_cxx_werror_flag"
13638                         || test ! -s conftest.err'
13639  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13640  (eval $ac_try) 2>&5
13641  ac_status=$?
13642  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13643  (exit $ac_status); }; } &&
13644         { ac_try='test -s conftest.$ac_objext'
13645  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13646  (eval $ac_try) 2>&5
13647  ac_status=$?
13648  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13649  (exit $ac_status); }; }; then
13650  ac_header_compiler=yes
13651 else
13652  echo "$as_me: failed program was:" >&5
13653 sed 's/^/| /' conftest.$ac_ext >&5
13498  
13655 ac_header_compiler=no
13656 fi
13657 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13658 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
13659 echo "${ECHO_T}$ac_header_compiler" >&6
13499  
13661 # Is the header present?
13662 echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5
13663 echo $ECHO_N "checking CGAL/Cartesian.h presence... $ECHO_C" >&6
13664 cat >conftest.$ac_ext <<_ACEOF
13665 /* confdefs.h.  */
13666 _ACEOF
13667 cat confdefs.h >>conftest.$ac_ext
13668 cat >>conftest.$ac_ext <<_ACEOF
13669 /* end confdefs.h.  */
13670 #include <CGAL/Cartesian.h>
13671 _ACEOF
13672 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
13673  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
13674  ac_status=$?
13675  grep -v '^ *+' conftest.er1 >conftest.err
13676  rm -f conftest.er1
13677  cat conftest.err >&5
13678  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13679  (exit $ac_status); } >/dev/null; then
13680  if test -s conftest.err; then
13681    ac_cpp_err=$ac_cxx_preproc_warn_flag
13682    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
13683  else
13684    ac_cpp_err=
13685  fi
13686 else
13687  ac_cpp_err=yes
13688 fi
13689 if test -z "$ac_cpp_err"; then
13690  ac_header_preproc=yes
13691 else
13692  echo "$as_me: failed program was:" >&5
13693 sed 's/^/| /' conftest.$ac_ext >&5
13500  
13695  ac_header_preproc=no
13696 fi
13697 rm -f conftest.err conftest.$ac_ext
13698 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
13699 echo "${ECHO_T}$ac_header_preproc" >&6
13501  
13701 # So?  What about this header?
13702 case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
13703  yes:no: )
13704    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&5
13705 echo "$as_me: WARNING: CGAL/Cartesian.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
13706    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&5
13707 echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the compiler's result" >&2;}
13708    ac_header_preproc=yes
13709    ;;
13710  no:yes:* )
13711    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&5
13712 echo "$as_me: WARNING: CGAL/Cartesian.h: present but cannot be compiled" >&2;}
13713    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&5
13714 echo "$as_me: WARNING: CGAL/Cartesian.h:     check for missing prerequisite headers?" >&2;}
13715    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&5
13716 echo "$as_me: WARNING: CGAL/Cartesian.h: see the Autoconf documentation" >&2;}
13717    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&5
13718 echo "$as_me: WARNING: CGAL/Cartesian.h:     section \"Present But Cannot Be Compiled\"" >&2;}
13719    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&5
13720 echo "$as_me: WARNING: CGAL/Cartesian.h: proceeding with the preprocessor's result" >&2;}
13721    { echo "$as_me:$LINENO: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&5
13722 echo "$as_me: WARNING: CGAL/Cartesian.h: in the future, the compiler will take precedence" >&2;}
13723    (
13724      cat <<\_ASBOX
13725 ## ------------------------------ ##
13726 ## Report this to gezelter@nd.edu ##
13727 ## ------------------------------ ##
13728 _ASBOX
13729    ) |
13730      sed "s/^/$as_me: WARNING:     /" >&2
13731    ;;
13732 esac
13733 echo "$as_me:$LINENO: checking for CGAL/Cartesian.h" >&5
13734 echo $ECHO_N "checking for CGAL/Cartesian.h... $ECHO_C" >&6
13735 if test "${ac_cv_header_CGAL_Cartesian_h+set}" = set; then
13736  echo $ECHO_N "(cached) $ECHO_C" >&6
13737 else
13738  ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc
13739 fi
13740 echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5
13741 echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6
13742
13743 fi
13744 if test $ac_cv_header_CGAL_Cartesian_h = yes; then
13745  cgal=yes
13746 else
13747  cgal=no
13748 fi
13749
13750
13751    CXXFLAGS="$save_CXXFLAGS"
13752
13753    if test "x$cgal" = xyes; then
13754      echo "$as_me:$LINENO: checking for CGAL version" >&5
13755 echo $ECHO_N "checking for CGAL version... $ECHO_C" >&6
13756      LOCATION=${CGAL_INCLDIR}
13757      LOCATION=${LOCATION:-/usr/include}
13758      if test -f $LOCATION/CGAL/version.h; then
13759        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'`
13760      else
13761        CGAL_VERSION=`grep '#define.*\<CGAL_VERSION\>.*' $LOCATION/CGAL/config.h | sed 's/[^0-9\.]*//g'`
13762      fi
13763      if echo $CGAL_VERSION | grep -q "^[3456789]"; then
13764        echo "$as_me:$LINENO: result: ($CGAL_VERSION) yes" >&5
13765 echo "${ECHO_T}($CGAL_VERSION) yes" >&6
13766      else
13767        echo "$as_me:$LINENO: result: ($CGAL_VERSION) no" >&5
13768 echo "${ECHO_T}($CGAL_VERSION) no" >&6
13769        cgal=no
13770      fi
13771    fi
13772
13773    if test "x$cgal" = xyes; then
13774      CGAL_LIBS="-lCGAL"
13775      echo "$as_me:$LINENO: checking whether CGAL uses LEDA" >&5
13776 echo $ECHO_N "checking whether CGAL uses LEDA... $ECHO_C" >&6
13777      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_LEDA; then
13778        CGAL_USES_LEDA=yes
13779        echo "$as_me:$LINENO: result: yes" >&5
13780 echo "${ECHO_T}yes" >&6
13781        CGAL_DEFINES="-DCGAL_USE_LEDA -DLEDA_PREFIX"
13782      else
13783        echo "$as_me:$LINENO: result: no" >&5
13784 echo "${ECHO_T}no" >&6
13785        CGAL_USES_LEDA=no
13786      fi
13787
13788      echo "$as_me:$LINENO: checking whether CGAL uses GMP" >&5
13789 echo $ECHO_N "checking whether CGAL uses GMP... $ECHO_C" >&6
13790      if echo $CGAL_CXXFLAGS | grep -q -- -DCGAL_USE_GMP; then
13791        CGAL_USES_GMP=yes
13792        echo "$as_me:$LINENO: result: yes" >&5
13793 echo "${ECHO_T}yes" >&6
13794        CGAL_DEFINES="-DCGAL_USE_GMP $CGAL_DEFINES"
13795      else
13796        echo "$as_me:$LINENO: result: no" >&5
13797 echo "${ECHO_T}no" >&6
13798        CGAL_USES_GMP=no
13799      fi
13800
13801      CGAL_LIBS="$CGAL_LIBS -lm"
13802
13803      CGAL_CXXFLAGS="-ftemplate-depth-50"
13804
13805      echo "$as_me:$LINENO: result: CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&5
13806 echo "${ECHO_T}CGAL_USES_LEDA=     $CGAL_USES_LEDA" >&6
13807      echo "$as_me:$LINENO: result: CGAL_USES_GMP =     $CGAL_USES_GMP" >&5
13808 echo "${ECHO_T}CGAL_USES_GMP =     $CGAL_USES_GMP" >&6
13809      echo "$as_me:$LINENO: result: CGAL_INCLDIR  =     $CGAL_INCLDIR" >&5
13810 echo "${ECHO_T}CGAL_INCLDIR  =     $CGAL_INCLDIR" >&6
13811      echo "$as_me:$LINENO: result: CGAL_LIBDIR   =     $CGAL_LIBDIR" >&5
13812 echo "${ECHO_T}CGAL_LIBDIR   =     $CGAL_LIBDIR" >&6
13813      echo "$as_me:$LINENO: result: CGAL_DEFINES  =     $CGAL_DEFINES" >&5
13814 echo "${ECHO_T}CGAL_DEFINES  =     $CGAL_DEFINES" >&6
13815      echo "$as_me:$LINENO: result: CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&5
13816 echo "${ECHO_T}CGAL_CXXFLAGS =     $CGAL_CXXFLAGS" >&6
13817      echo "$as_me:$LINENO: result: CGAL_LIBS     =     $CGAL_LIBS" >&5
13818 echo "${ECHO_T}CGAL_LIBS     =     $CGAL_LIBS" >&6
13819    fi
13820
13821    if test "x$cgal" = xyes; then
13822      save_LIBS="$LIBS"
13823      LIBS="$LIBS -L$CGAL_LIBDIR"
13824      if test "x$CGAL_USES_LEDA" = xyes; then
13825        LIBS="-lL $LIBS -L$LEDA_LIBDIR"
13826      fi
13827      # if test "x$CGAL_USES_GMP" = xyes; then
13828      #   LIBS="-lgmp $LIBS $GMP_LIBDIR"
13829      # fi
13830      echo "$as_me:$LINENO: checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL" >&5
13831 echo $ECHO_N "checking for ::CGAL::Cartesian<int>::Point_2 in -lCGAL... $ECHO_C" >&6
13832 save_CXXFLAGS_CHECK_CXX_LIB="$CXXFLAGS"
13833 CXXFLAGS="$CXXFLAGS -I$CGAL_INCLDIR -I$CGAL_INCLCONFDIR"
13834 save_LIBS_CHECK_CXX_LIB="$LIBS"
13835 LIBS="-lCGAL  $LIBS"
13836 cat >conftest.$ac_ext <<_ACEOF
13837 /* confdefs.h.  */
13838 _ACEOF
13839 cat confdefs.h >>conftest.$ac_ext
13840 cat >>conftest.$ac_ext <<_ACEOF
13841 /* end confdefs.h.  */
13842 #include <CGAL/Cartesian.h>
13843 #ifdef FC_DUMMY_MAIN
13844 #ifndef FC_DUMMY_MAIN_EQ_F77
13845 #  ifdef __cplusplus
13846     extern "C"
13847 #  endif
13848   int FC_DUMMY_MAIN() { return 1; }
13849 #endif
13850 #endif
13851 int
13852 main ()
13853 {
13854 ::CGAL::Cartesian<int>::Point_2 P
13855  ;
13856  return 0;
13857 }
13858 _ACEOF
13859 rm -f conftest.$ac_objext conftest$ac_exeext
13860 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
13861  (eval $ac_link) 2>conftest.er1
13862  ac_status=$?
13863  grep -v '^ *+' conftest.er1 >conftest.err
13864  rm -f conftest.er1
13865  cat conftest.err >&5
13866  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13867  (exit $ac_status); } &&
13868         { ac_try='test -z "$ac_cxx_werror_flag"
13869                         || test ! -s conftest.err'
13870  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13871  (eval $ac_try) 2>&5
13872  ac_status=$?
13873  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13874  (exit $ac_status); }; } &&
13875         { ac_try='test -s conftest$ac_exeext'
13876  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13877  (eval $ac_try) 2>&5
13878  ac_status=$?
13879  echo "$as_me:$LINENO: \$? = $ac_status" >&5
13880  (exit $ac_status); }; }; then
13881  echo "$as_me:$LINENO: result: yes" >&5
13882 echo "${ECHO_T}yes" >&6
13883 cgal=yes
13884 else
13885  echo "$as_me: failed program was:" >&5
13886 sed 's/^/| /' conftest.$ac_ext >&5
13887
13888 echo "$as_me:$LINENO: result: no" >&5
13889 echo "${ECHO_T}no" >&6
13890 cgal=no
13891 fi
13892 rm -f conftest.err conftest.$ac_objext \
13893      conftest$ac_exeext conftest.$ac_ext
13894 CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB"
13895 LIBS="$save_LIBS_CHECK_CXX_LIB"
13896      LIBS="$save_LIBS"
13897    fi
13898
13899  fi
13900  ac_ext=c
13901 ac_cpp='$CPP $CPPFLAGS'
13902 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13903 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13904 ac_compiler_gnu=$ac_cv_c_compiler_gnu
13905
13906
13907 fi
13908
13909 if test "x$cgal" = xyes; then
13910  USE_CGAL=yes
13911
13912 cat >>confdefs.h <<\_ACEOF
13913 #define HAVE_CGAL 1
13914 _ACEOF
13915
13916
13917 cat >>confdefs.h <<_ACEOF
13918 #define CGAL_VERSION $CGAL_VERSION
13919 _ACEOF
13920
13921  if ! echo $CGAL_VERSION | grep -q "^3.0"; then
13922    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
13923 echo "$as_me: WARNING: *****************************************************" >&2;}
13924    { echo "$as_me:$LINENO: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&5
13925 echo "$as_me: WARNING: *** Warning: Your CGAL version is newer than the  ***" >&2;}
13926    { echo "$as_me:$LINENO: WARNING: *** supported versions. It may still work though. ***" >&5
13927 echo "$as_me: WARNING: *** supported versions. It may still work though. ***" >&2;}
13928    { echo "$as_me:$LINENO: WARNING: *****************************************************" >&5
13929 echo "$as_me: WARNING: *****************************************************" >&2;}
13930  fi
13931 else
13932   if test "x$cgal_makefile" != xno; then
13933    echo "$as_me:$LINENO: result: No CGAL support. These are not the droids you want." >&5
13934 echo "${ECHO_T}No CGAL support. These are not the droids you want." >&6
13935  fi
13936  CGAL_INCLDIR=
13937  CGAL_LIBDIR=
13938  CGAL_RLIBDIR=
13939  CGAL_DEFINES=
13940  CGAL_CXXFLAGS=
13941  CGAL_LIBS=
13942 fi
13943
13944
13945 CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}"
13946
13947 CGAL_LIB_DIR=${CGAL_LIBDIR}
13948
13949 CGAL_RLIB_DIR=${CGAL_RLIBDIR}
13950
13951
13952
13953
13954
13955
13502   # Check whether --enable-doxygen or --disable-doxygen was given.
13503   if test "${enable_doxygen+set}" = set; then
13504    enableval="$enable_doxygen"
# Line 14106 | Line 13652 | fi
13652  
13653  
13654  
13655 <                                                            ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile src/applications/utilities/affineScale src/applications/utilities/waterBoxer scripts/filepp"
13655 >                                                  ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/math/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp"
13656  
13657  
13658   cat >confcache <<\_ACEOF
# Line 14639 | Line 14185 | do
14185    # Handling of arguments.
14186    "make/Makefile" ) CONFIG_FILES="$CONFIG_FILES make/Makefile" ;;
14187    "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
14188 +  "src/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/math/Makefile" ;;
14189    "src/applications/nanoRodBuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/applications/nanoRodBuilder/Makefile" ;;
14643  "src/applications/utilities/affineScale" ) CONFIG_FILES="$CONFIG_FILES src/applications/utilities/affineScale" ;;
14644  "src/applications/utilities/waterBoxer" ) CONFIG_FILES="$CONFIG_FILES src/applications/utilities/waterBoxer" ;;
14190    "scripts/filepp" ) CONFIG_FILES="$CONFIG_FILES scripts/filepp" ;;
14191    "src/getopt.h" ) CONFIG_LINKS="$CONFIG_LINKS src/getopt.h:src/utils/gnugetopt.h" ;;
14192    "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
# Line 14794 | Line 14339 | s,@USE_MPI@,$USE_MPI,;t t
14339   s,@MPI_LIB@,$MPI_LIB,;t t
14340   s,@MPI_F90_LIB@,$MPI_F90_LIB,;t t
14341   s,@USE_MPI@,$USE_MPI,;t t
14797 s,@USE_CGAL@,$USE_CGAL,;t t
14798 s,@CGAL_INC_DIR@,$CGAL_INC_DIR,;t t
14799 s,@CGAL_LIB_DIR@,$CGAL_LIB_DIR,;t t
14800 s,@CGAL_RLIB_DIR@,$CGAL_RLIB_DIR,;t t
14801 s,@CGAL_DEFINES@,$CGAL_DEFINES,;t t
14802 s,@CGAL_CXXFLAGS@,$CGAL_CXXFLAGS,;t t
14803 s,@CGAL_LIBS@,$CGAL_LIBS,;t t
14342   s,@DOXYGEN@,$DOXYGEN,;t t
14343   s,@DOT@,$DOT,;t t
14344   s,@DOC@,$DOC,;t t
# Line 15053 | Line 14591 | s,@INSTALL@,$ac_INSTALL,;t t
14591    case $ac_file in
14592      make/Makefile ) chmod 0755 scripts/* ;;
14593      src/utils/Makefile ) chmod 0755 scripts/* ;;
14594 +    src/math/Makefile ) chmod 0755 scripts/* ;;
14595      src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;;
15057    src/applications/utilities/affineScale ) chmod 0755 scripts/* ;;
15058    src/applications/utilities/waterBoxer ) chmod 0755 scripts/* ;;
14596      scripts/filepp ) chmod 0755 scripts/* ;;
14597    esac
14598   done

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines