--- trunk/OOPSE-2.0/configure 2005/02/15 05:59:14 2026 +++ trunk/OOPSE-2.0/configure 2005/07/20 17:04:42 2265 @@ -312,7 +312,7 @@ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKA # include #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 PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT AR PS MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI SPRNG_LIB_DIR SPRNG_INC_DIR SPRNG_LIB USE_SPRNG MKL_LIBDIR MKL_LIB MKL_INC HAVE_MKL DOXYGEN DOT DOC enable_dot enable_html_docs enable_latex_docs BATEXT MKINSTALLDIRS OOPSE OOPSE_HOME SUBDIRS FFLAGS 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 PROGNAME debug build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OOPSE_TEMPLATE_FLAGS EXTRA_CC_FLAG F90 F90FLAGS ac_ct_F90 PREPFLAG PREPDEFFLAG F90LIBS F90_FUNC F90_FUNC_ MOD F90_WORK_FILES_ARG MODDIRFLAG F90MODINCSPEC F90_MODULE_NAMES CPP EGREP LIBOBJS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT PERLINTERP PERL_SHEBANG AR PS MPI_LIB_DIR MPI_INC_DIR MPI_F90_INC MPI_LIB MPI_F90_LIB USE_MPI CXXCPP 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 FFLAGS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -789,6 +789,10 @@ ac_cv_env_CPP_value=$CPP ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP +ac_env_CXXCPP_set=${CXXCPP+set} +ac_env_CXXCPP_value=$CXXCPP +ac_cv_env_CXXCPP_set=${CXXCPP+set} +ac_cv_env_CXXCPP_value=$CXXCPP # # Report the --help message. @@ -875,10 +879,10 @@ Optional Packages: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-perl-shebang override what perl thinks is the way for the kernel + to start it (seldom needed) --with-mpi= compile with MPI installed in [default=no] - --with-sprng= compile with SPRNG installed in - [default=/usr/local] - --with-mkl Do we want MKL will check /usr/local/intel/mkl61 /opt/intel/mkl61 + --with-cgal-makefile=FILE CGAL makefile that should be used Some influential environment variables: CC C compiler command @@ -892,6 +896,7 @@ Some influential environment variables: F90 Fortran 90 compiler command F90FLAGS Fortran 90 compiler flags CPP C preprocessor + CXXCPP C++ preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1877,6 +1882,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This sho +# +# +# @@ -3542,7 +3550,7 @@ F90FLAGS="$F90FLAGS $ac_verb" ac_save_F90FLAGS=$F90FLAGS F90FLAGS="$F90FLAGS $ac_verb" -(eval echo $as_me:3545: \"$ac_link\") >&5 +(eval echo $as_me:3553: \"$ac_link\") >&5 ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f90_v_output" >&5 F90FLAGS=$ac_save_F90FLAGS @@ -3619,7 +3627,7 @@ F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v" ac_save_F90FLAGS=$F90FLAGS F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v" -(eval echo $as_me:3622: \"$ac_link\") >&5 +(eval echo $as_me:3630: \"$ac_link\") >&5 ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f90_v_output" >&5 F90FLAGS=$ac_save_F90FLAGS @@ -7158,6 +7166,125 @@ fi fi fi + + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PERLINTERP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PERLINTERP in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERLINTERP="$PERLINTERP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PERLINTERP="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PERLINTERP" && ac_cv_path_PERLINTERP="perl" + ;; +esac +fi +PERLINTERP=$ac_cv_path_PERLINTERP + +if test -n "$PERLINTERP"; then + echo "$as_me:$LINENO: result: $PERLINTERP" >&5 +echo "${ECHO_T}$PERLINTERP" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + ac_cv_path_perlinterp="$PERLINTERP" + _sHpB='#!' + + +# Check whether --with-perl-shebang or --without-perl-shebang was given. +if test "${with_perl_shebang+set}" = set; then + withval="$with_perl_shebang" + opt_perl_shebang="$withval" +else + opt_perl_shebang="not_set" +fi; + echo "$as_me:$LINENO: checking whether explicit instead of detected sharpbang is to be used" >&5 +echo $ECHO_N "checking whether explicit instead of detected sharpbang is to be used... $ECHO_C" >&6 +if test "${ax_cv_opt_perl_shebang+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case "$opt_perl_shebang" in + not_set ) ax_cv_opt_perl_shebang='' + ;; + * ) + ax_cv_opt_perl_shebang=`echo "$opt_perl_shebang" | sed -e's|^#!\s*\(.*\)$|\1|'` + esac + +fi +echo "$as_me:$LINENO: result: $ax_cv_opt_perl_shebang" >&5 +echo "${ECHO_T}$ax_cv_opt_perl_shebang" >&6 + if test "A$ax_cv_opt_perl_shebang" != "A" + then + ac_cv_sys_kernshrpbang_perl="$ax_cv_opt_perl_shebang" + PERL_SHEBANG="$ac_cv_sys_kernshrpbang_perl" + { echo "$as_me:$LINENO: OK - PERL_SHEBANG is $_sHpB$PERL_SHEBANG." >&5 +echo "$as_me: OK - PERL_SHEBANG is $_sHpB$PERL_SHEBANG." >&6;} + +# Automatic detection of sharpbang formula starts here + else + _somian_shbangperl=`$PERLINTERP -V:startperl` + negclass="[^']"; # must leave this comment: m4 will remove the outer brackets for us, heheh + echo "$as_me:$LINENO: checking for kernel sharpbang invocation to start perl" >&5 +echo $ECHO_N "checking for kernel sharpbang invocation to start perl... $ECHO_C" >&6 +if test "${ac_cv_sys_kernshrpbang_perl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + _somian_kspb_perl=`echo "$_somian_shbangperl" | sed -ne"s|.*='\($negclass*\)';$|\1|p"` + if test "x$_somian_kspb_perl" == x + then _somian_ksbp_warn_empty='durnit' + else + case "A$_somian_kspb_perl" in + A#!*perl* ) + ac_cv_sys_kernshrpbang_perl=`echo "$_somian_kspb_perl" | sed -e's|#!\(.*\)$|\1|'` + ;; + A* ) _somian_ksbp_warn_defau='trouble' + ac_cv_sys_kernshrpbang_perl="$PERLINTERP" + esac + fi + +fi +echo "$as_me:$LINENO: result: $ac_cv_sys_kernshrpbang_perl" >&5 +echo "${ECHO_T}$ac_cv_sys_kernshrpbang_perl" >&6 +# The above prints Checking ... result message to user. + PERL_SHEBANG="$ac_cv_sys_kernshrpbang_perl" + + if test A${_somian_ksbp_warn_empty+set} == Aset + then { echo "$as_me:$LINENO: WARNING: In last check, doing $PERLINTERP -V:startperl yielded empty result! That should not happen." >&5 +echo "$as_me: WARNING: In last check, doing $PERLINTERP -V:startperl yielded empty result! That should not happen." >&2;} + fi +# Inform user after printing result value + if test A${_somian_ksbp_warn_defau+set} == Aset + then { echo "$as_me:$LINENO: Maybe Not good -" >&5 +echo "$as_me: Maybe Not good -" >&6;} + { echo "$as_me:$LINENO: WARNING: In last check perl's Config query did not work so we bunted: $_sHpB$PERLINTERP" >&5 +echo "$as_me: WARNING: In last check perl's Config query did not work so we bunted: $_sHpB$PERLINTERP" >&2;} + else { echo "$as_me:$LINENO: OK Good result - " >&5 +echo "$as_me: OK Good result - " >&6;} + { echo "$as_me:$LINENO: In last check we got a proper-looking answer from perl's Config: $_somian_shbangperl" >&5 +echo "$as_me: In last check we got a proper-looking answer from perl's Config: $_somian_shbangperl" >&6;} + fi + fi + # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -7313,7 +7440,7 @@ else if test "$ac_cv_prog_ps_ax" = yes; then ac_cv_prog_ps_syntax=BSD else - if test "$ac_cv_prog_ps_es" = yes; then + if test "$ac_cv_prog_ps_ef" = yes; then ac_cv_prog_ps_syntax=POSIX else { { echo "$as_me:$LINENO: error: Could not determine ps syntax" >&5 @@ -7326,16 +7453,29 @@ cat >>confdefs.h <<_ACEOF echo "$as_me:$LINENO: result: $ac_cv_prog_ps_syntax" >&5 echo "${ECHO_T}$ac_cv_prog_ps_syntax" >&6 + cat >>confdefs.h <<_ACEOF -#define PSCOMMAND "$PS" +#define PSCOMMAND $PS _ACEOF -cat >>confdefs.h <<_ACEOF -#define PSTYPE $ac_cv_prog_ps_syntax +if test "$ac_cv_prog_ps_syntax" = BSD; then + cat >>confdefs.h <<\_ACEOF +#define PSTYPE_IS_BSD 1 _ACEOF +else + if test "$ac_cv_prog_ps_syntax" = POSIX; then + cat >>confdefs.h <<\_ACEOF +#define PSTYPE_IS_POSIX 1 +_ACEOF + else + { { echo "$as_me:$LINENO: error: Unknown ps syntax type!" >&5 +echo "$as_me: error: Unknown ps syntax type!" >&2;} + { (exit 1); exit 1; }; } + fi +fi # Check whether --with-mpi or --without-mpi was given. @@ -7366,12 +7506,16 @@ echo '#include ' > conftest.cc echo "$as_me:$LINENO: checking for mpi.h" >&5 echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6 have_mpi_h=0 +rm -f conftest* echo '#include ' > conftest.cc -if test -z "`${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1`"; then +if ${CXX} -I${MPI_INC_DIR} -c conftest.cc 2>&1 ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 have_mpi_h=1 else + if test -s conftest.out ; then + cat conftest.out >> config.log + fi echo "$as_me:$LINENO: result: no! Check MPI include paths" >&5 echo "${ECHO_T}no! Check MPI include paths" >&6 USE_MPI="no" @@ -7808,196 +7952,356 @@ fi -# Check whether --with-sprng or --without-sprng was given. -if test "${with_sprng+set}" = set; then - withval="$with_sprng" - with_sprng=$withval -else - with_sprng="/usr/local" -fi; -case "x$with_sprng" in - xyes | "x") USE_SPRNG=yes;; - xno) USE_SPRNG=no ;; - *) SPRNG="$with_sprng"; USE_SPRNG=yes ;; -esac -if test "$USE_SPRNG" = "yes" -a -z "$with_sprng"; then - SPRNG="/usr/local" -fi -if test "$USE_SPRNG" = "yes"; then +USE_CGAL=no +cgal_makefile=auto +# 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" +fi; -# Set variables... -SPRNG_LIB_DIR="$SPRNG/lib" -SPRNG_INC_DIR="$SPRNG/include" +if test "x$cgal_makefile" != xno; then + if test "x$cgal_makefile" = xauto -a "x$CGAL_MAKEFILE" != x; then + cgal_makefile="$CGAL_MAKEFILE" + fi + echo "$as_me:$LINENO: checking for cgal_makefile: $cgal_makefile" >&5 +echo $ECHO_N "checking for cgal_makefile: $cgal_makefile... $ECHO_C" >&6 -echo "$as_me:$LINENO: checking for sprng.h" >&5 -echo $ECHO_N "checking for sprng.h... $ECHO_C" >&6 -have_sprng_h=0 -echo '#include ' > conftest.cc -if test -z "`${CXX} -I${SPRNG_INC_DIR} -c conftest.cc 2>&1`"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - have_sprng_h=1 -else - echo "$as_me:$LINENO: result: no! Check SPRNG include path!" >&5 -echo "${ECHO_T}no! Check SPRNG include path!" >&6 - USE_SPRNG="no" -fi -rm -f conftest* -if test "$have_sprng_h" = 1; then + if test -f "$cgal_makefile"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_SPRNG_H 1 -_ACEOF + cat >config.tmp.Makefile <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 + + make -s -f config.tmp.Makefile + . config.tmp.cgalvariables + + rm -f config.tmp.Makefile config.tmp.cgalvariables -fi + if test "x$CGAL_INCLDIR" = "x"; then + CGAL_INCLDIR="" + 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 "x$CGAL_LIBDIR" = "x"; then + CGAL_LIBDIR="" + fi -ac_save_LDFLAGS=$LDFLAGS -LDFLAGS="${LDFLAGS} -L${SPRNG_LIB_DIR} " + if test "x$CGAL_RLIBDIR" = "x"; then + CGAL_RLIBDIR="" + fi -echo "$as_me:$LINENO: checking for init_rng in -lsprng" >&5 -echo $ECHO_N "checking for init_rng in -lsprng... $ECHO_C" >&6 -if test "${ac_cv_lib_sprng_init_rng+set}" = set; then + 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" + +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 +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsprng $LIBS" -cat >conftest.$ac_ext <<_ACEOF + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + 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" +#ifdef __STDC__ +# include +#else +# include #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char init_rng (); -int -main () -{ -init_rng (); - ; - return 0; -} + Syntax error _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +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); } && - { 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_sprng_init_rng=yes + (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 + else + ac_cpp_err= + fi else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_sprng_init_rng=no + # Broken: fails on valid input. +continue fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_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_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sprng_init_rng" >&5 -echo "${ECHO_T}$ac_cv_lib_sprng_init_rng" >&6 -if test $ac_cv_lib_sprng_init_rng = yes; then - SPRNG_LIB="-lsprng" +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: Didn't find libsprng; check path for SPRNG package first..." >&5 -echo "$as_me: error: Didn't find libsprng; check path for SPRNG package first..." >&2;} - { (exit 1); exit 1; }; } - USE_SPRNG="no" + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break fi + done + ac_cv_prog_CXXCPP=$CXXCPP -if test "$USE_SPRNG" = "no"; then - { { echo "$as_me:$LINENO: error: No working SPRNG library found" >&5 -echo "$as_me: error: No working SPRNG library found" >&2;} - { (exit 1); exit 1; }; } +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP fi +echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6 +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_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_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.$ac_ext + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_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_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.$ac_ext - -echo "$as_me:$LINENO: checking if MKL is wanted" >&5 -echo $ECHO_N "checking if MKL is wanted... $ECHO_C" >&6 - -# Check whether --with-mkl or --without-mkl was given. -if test "${with_mkl+set}" = set; then - withval="$with_mkl" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - for dir in $withval /usr/local/intel/mkl61 /opt/intel/mkl61; do - mkldir="$dir" - if test -f "$dir/include/mkl.h"; then - found_mkl="yes"; - break; - fi - done - if test x_$found_mkl != x_yes; then - { { echo "$as_me:$LINENO: error: Cannot find MKL includes" >&5 -echo "$as_me: error: Cannot find MKL includes" >&2;} +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } - else - printf "MKL includes found in $mkldir/include\n"; - fi +fi +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 - 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 - - ac_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="${CPPFLAGS} -I${mkldir}/include" - ac_save_LDFLAGS=$LDFLAGS - LDFLAGS="${LDFLAGS} -L${mkldir}/lib/32 -lmkl -lvml -lguide" - if test "${ac_cv_header_mkl_h+set}" = set; then - echo "$as_me:$LINENO: checking for mkl.h" >&5 -echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6 -if test "${ac_cv_header_mkl_h+set}" = set; then +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 echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5 -echo "${ECHO_T}$ac_cv_header_mkl_h" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5 +echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6 else # Is the header compilable? -echo "$as_me:$LINENO: checking mkl.h usability" >&5 -echo $ECHO_N "checking mkl.h usability... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking CGAL/Cartesian.h usability" >&5 +echo $ECHO_N "checking CGAL/Cartesian.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8005,7 +8309,7 @@ $ac_includes_default cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -8016,7 +8320,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_c_werror_flag" + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 @@ -8041,15 +8345,15 @@ echo "$as_me:$LINENO: checking mkl.h presence" >&5 echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? -echo "$as_me:$LINENO: checking mkl.h presence" >&5 -echo $ECHO_N "checking mkl.h presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking CGAL/Cartesian.h presence" >&5 +echo $ECHO_N "checking CGAL/Cartesian.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 +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -8060,8 +8364,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_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else ac_cpp_err= fi @@ -8081,27 +8385,27 @@ case $ac_header_compiler:$ac_header_preproc:$ac_c_prep 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 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mkl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mkl.h: proceeding with the compiler's result" >&2;} + { 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;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mkl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mkl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mkl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mkl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mkl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mkl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mkl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mkl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mkl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mkl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mkl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mkl.h: in the future, the compiler will take precedence" >&2;} + { 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;} ( cat <<\_ASBOX ## ------------------------------ ## @@ -8112,44 +8416,120 @@ echo "$as_me:$LINENO: checking for mkl.h" >&5 sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for mkl.h" >&5 -echo $ECHO_N "checking for mkl.h... $ECHO_C" >&6 -if test "${ac_cv_header_mkl_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 echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_mkl_h=$ac_header_preproc + ac_cv_header_CGAL_Cartesian_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_mkl_h" >&5 -echo "${ECHO_T}$ac_cv_header_mkl_h" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_CGAL_Cartesian_h" >&5 +echo "${ECHO_T}$ac_cv_header_CGAL_Cartesian_h" >&6 fi -if test $ac_cv_header_mkl_h = yes; then +if test $ac_cv_header_CGAL_Cartesian_h = yes; then + cgal=yes +else + cgal=no +fi - echo "$as_me:$LINENO: checking for vslNewStream in -lmkl" >&5 -echo $ECHO_N "checking for vslNewStream in -lmkl... $ECHO_C" >&6 -if test "${ac_cv_lib_mkl_vslNewStream+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmkl $LIBS" + + CXXFLAGS="$save_CXXFLAGS" + + 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.*\.*' $LOCATION/CGAL/version.h | sed 's/[^0-9\.]*//g'` + else + CGAL_VERSION=`grep '#define.*\.*' $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 + + 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 + + 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::Point_2 in -lCGAL" >&5 +echo $ECHO_N "checking for ::CGAL::Cartesian::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" +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. */ - -/* 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 vslNewStream (); +#include int main () { -vslNewStream (); +::CGAL::Cartesian::Point_2 P ; return 0; } @@ -8163,7 +8543,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_c_werror_flag" + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 @@ -8176,33 +8556,25 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_mkl_vslNewStream=yes + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +cgal=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mkl_vslNewStream=no +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +cgal=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_mkl_vslNewStream" >&5 -echo "${ECHO_T}$ac_cv_lib_mkl_vslNewStream" >&6 -if test $ac_cv_lib_mkl_vslNewStream = yes; then - MKL_LIBDIR="${mkldir}/lib/32", - MKL_LIB="-lmkl -lvml -lguide", - HAVE_MKL="yes" -fi +CXXFLAGS="$save_CXXFLAGS_CHECK_CXX_LIB" +LIBS="$save_LIBS_CHECK_CXX_LIB" + LIBS="$save_LIBS" + fi - -else - MKL_INC="-I${mkldir}/include" -fi - - - CPPFLAGS=$ac_save_CPPFLAGS - LDFLAGS=$ac_save_LDFLAGS + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8210,25 +8582,56 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test x_$HAVE_MKL != x_yes; then - { { echo "$as_me:$LINENO: error: Can't build with MKL" >&5 -echo "$as_me: error: Can't build with MKL" >&2;} - { (exit 1); exit 1; }; } - fi +fi +if test "x$cgal" = xyes; then + USE_CGAL=yes +cat >>confdefs.h <<\_ACEOF +#define HAVE_CGAL 1 +_ACEOF +cat >>confdefs.h <<_ACEOF +#define CGAL_VERSION $CGAL_VERSION +_ACEOF + 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 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= +fi - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + +CGAL_INC_DIR="${CGAL_INCLDIR} ${CGAL_INCLCONFDIR}" -fi; +CGAL_LIB_DIR=${CGAL_LIBDIR} + +CGAL_RLIB_DIR=${CGAL_RLIBDIR} + + + + # Check whether --enable-doxygen or --disable-doxygen was given. if test "${enable_doxygen+set}" = set; then enableval="$enable_doxygen" @@ -8429,7 +8832,7 @@ esac ac_config_headers="$ac_config_headers src/config.h" - ac_config_files="$ac_config_files make/Makefile src/utils/Makefile" + ac_config_files="$ac_config_files make/Makefile src/utils/Makefile src/applications/nanoRodBuilder/Makefile scripts/filepp" cat >confcache <<\_ACEOF @@ -8962,6 +9365,8 @@ 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" ;; + "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" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -9098,6 +9503,8 @@ s,@AR@,$AR,;t t s,@LEX@,$LEX,;t t s,@LEXLIB@,$LEXLIB,;t t s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t +s,@PERLINTERP@,$PERLINTERP,;t t +s,@PERL_SHEBANG@,$PERL_SHEBANG,;t t s,@AR@,$AR,;t t s,@PS@,$PS,;t t s,@MPI_LIB_DIR@,$MPI_LIB_DIR,;t t @@ -9106,14 +9513,14 @@ s,@SPRNG_LIB_DIR@,$SPRNG_LIB_DIR,;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,@SPRNG_LIB_DIR@,$SPRNG_LIB_DIR,;t t -s,@SPRNG_INC_DIR@,$SPRNG_INC_DIR,;t t -s,@SPRNG_LIB@,$SPRNG_LIB,;t t -s,@USE_SPRNG@,$USE_SPRNG,;t t -s,@MKL_LIBDIR@,$MKL_LIBDIR,;t t -s,@MKL_LIB@,$MKL_LIB,;t t -s,@MKL_INC@,$MKL_INC,;t t -s,@HAVE_MKL@,$HAVE_MKL,;t t +s,@CXXCPP@,$CXXCPP,;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_LIBS@,$CGAL_LIBS,;t t s,@DOXYGEN@,$DOXYGEN,;t t s,@DOT@,$DOT,;t t s,@DOC@,$DOC,;t t @@ -9363,6 +9770,13 @@ done rm -f $tmp/out fi + # Run the commands associated with the file. + case $ac_file in + make/Makefile ) chmod 0755 scripts/* ;; + src/utils/Makefile ) chmod 0755 scripts/* ;; + src/applications/nanoRodBuilder/Makefile ) chmod 0755 scripts/* ;; + scripts/filepp ) chmod 0755 scripts/* ;; + esac done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF