From 45275b8e765c18e2e125a77bb83d2969e4ec2b91 Mon Sep 17 00:00:00 2001 From: bangerth Date: Wed, 30 Jun 2010 11:50:49 +0000 Subject: [PATCH] Merge fixed 21407 and 21408. git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21410 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 2270 ++++++++++++++++++------------------ deal.II/configure.in | 15 +- deal.II/doc/news/changes.h | 8 +- 3 files changed, 1149 insertions(+), 1144 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index 7f54ecc8e5..f743a7993c 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -694,6 +694,7 @@ DEAL_II_EXPAND_PETSC_MPI_BLOCKVECTOR DEAL_II_EXPAND_PETSC_BLOCKVECTOR DEAL_II_EXPAND_PETSC_MPI_VECTOR DEAL_II_EXPAND_PETSC_VECTOR +BOOST_INCLUDE_DIR DEAL_II_DISABLE_PARSER enableparser RANLIB @@ -709,7 +710,6 @@ F77FLAGSG F77FLAGSO F77_VERSION F77 -BOOST_INCLUDE_DIR EGREP GREP CXXCPP @@ -791,11 +791,11 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_threads -with_boost enable_shared enable_parser enable_mgcompatibility enable_compat_blocker +with_boost with_petsc with_petsc_arch with_slepc @@ -11512,59 +11512,185 @@ fi -BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include" +{ $as_echo "$as_me:$LINENO: result: " >&5 +$as_echo "" >&6; } +{ $as_echo "$as_me:$LINENO: result: ---------------- configuring F77 compilers ------------------" >&5 +$as_echo "---------------- configuring F77 compilers ------------------" >&6; } -# Check whether --with-boost was given. -if test "${with_boost+set}" = set; then - withval=$with_boost; - if test "x$withval" != "xyes" ; then - BOOST_INCLUDE_DIR="-I$withval" - if test "$LD_PATH_OPTION" != "no" ; then - BOOST_LIB_DIR="$LD_PATH_OPTION$withval/lib" - fi - else - BOOST_INCLUDE_DIR='' - BOOST_LIB_DIR='' +for ac_prog in gfortran f77 g77 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_F77+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $F77 in + [\\/]* | ?:[\\/]*) + ac_cv_path_F77="$F77" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_F77="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done +IFS=$as_save_IFS + ;; +esac +fi +F77=$ac_cv_path_F77 +if test -n "$F77"; then + { $as_echo "$as_me:$LINENO: result: $F77" >&5 +$as_echo "$F77" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS" - LDFLAGS="$BOOST_LIB_DIR $LDFLAGS" + test -n "$F77" && break +done - if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } -if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then + +if test "x$F77" != "x" ; then + + if test "x$F77" != "x" ; then + + F77_VERSION_STRING="`($F77 -v 2>&1) | head -n 10`" + if test -n "`echo $F77_VERSION_STRING | grep \"GNU F77\"`" -o \ + -n "`echo $F77_VERSION_STRING | grep \"gcc version\"`" ; then + G77_VERSION_STRING="`($F77 -v 2>&1) | grep \"gcc version\"`" + + full_version=`echo "$G77_VERSION_STRING" | perl -pi -e 's/.*version (\d\.\d\.\d).*/\1/g;'` + F77_VERSION=gcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + + { $as_echo "$as_me:$LINENO: result: F77 compiler is $CC_VERSION" >&5 +$as_echo "F77 compiler is $CC_VERSION" >&6; } + + else + + if test -n "`echo $F77_VERSION_STRING | grep \"XL Fortran for AIX\"`" ; then + + F77_VERSION=AIXF77 + { $as_echo "$as_me:$LINENO: result: F77 compiler is AIX Fortran77" >&5 +$as_echo "F77 compiler is AIX Fortran77" >&6; } + + else + + F77_VERSION_STRING=`($F77 -V 2>&1)` + if test -n "`echo $F77_VERSION_STRING | grep \"WorkShop Compilers\"`" \ + -o \ + -n "`echo $F77_VERSION_STRING | grep \"Sun WorkShop\"`" \ + -o \ + -n "`echo $F77_VERSION_STRING | grep \"Forte Developer\"`" ; then + { $as_echo "$as_me:$LINENO: result: F77 compiler is Sun WorkShop f77" >&5 +$as_echo "F77 compiler is Sun WorkShop f77" >&6; } + F77_VERSION="SunF77" + + else + + F77_VERSION_STRING=`($F77 -version 2>&1)` + if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then + { $as_echo "$as_me:$LINENO: result: F77 compiler is MIPSpro f77" >&5 +$as_echo "F77 compiler is MIPSpro f77" >&6; } + F77_VERSION="MIPSproF77" + + else + + F77_VERSION_STRING=`($F77 -V 2>&1)` + is_intel_ifc="`echo $F77_VERSION_STRING | grep 'Intel(R) Fortran'`" + if test "x$is_intel_ifc" != "x" ; then + { $as_echo "$as_me:$LINENO: result: F77 compiler is Intel Fortran" >&5 +$as_echo "F77 compiler is Intel Fortran" >&6; } + F77_VERSION=INTEL_F77 + + else + + + F77_VERSION="UnknownF77" + { $as_echo "$as_me:$LINENO: result: F77 compiler is unkown. no flags set!" >&5 +$as_echo "F77 compiler is unkown. no flags set!" >&6; } + fi + fi + fi + fi + fi + fi + + + case "$F77_VERSION" in + gcc*) + F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" + F77FLAGSO="$FFLAGS -O2 -funroll-loops -funroll-all-loops -fstrict-aliasing" + + case "$target" in + *cygwin* ) + F77FLAGSPIC= + ;; + + *apple-darwin*) + if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then + F77FLAGSG="$F77FLAGSG -m64" + F77FLAGSO="$F77FLAGSO -m64" + fi + ;; + + * ) + F77FLAGSPIC="-fPIC" + ;; + esac + + { $as_echo "$as_me:$LINENO: checking for e_wsfe in -lg2c" >&5 +$as_echo_n "checking for e_wsfe in -lg2c... " >&6; } +if test "${ac_cv_lib_g2c_e_wsfe+set}" = set; then $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 -$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lg2c $LIBS" 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 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char e_wsfe (); +int +main () +{ +return e_wsfe (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -11573,139 +11699,137 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_g2c_e_wsfe=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_lib_g2c_e_wsfe=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_g2c_e_wsfe" >&5 +$as_echo "$ac_cv_lib_g2c_e_wsfe" >&6; } +if test "x$ac_cv_lib_g2c_e_wsfe" = x""yes; then + F77LIBS="$F77LIBS -lg2c" +fi -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 -$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; } + + { $as_echo "$as_me:$LINENO: checking for _gfortran_allocate in -lgfortran" >&5 +$as_echo_n "checking for _gfortran_allocate in -lgfortran... " >&6; } +if test "${ac_cv_lib_gfortran__gfortran_allocate+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgfortran $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char _gfortran_allocate (); +int +main () +{ +return _gfortran_allocate (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes + ac_cv_lib_gfortran__gfortran_allocate=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + ac_cv_lib_gfortran__gfortran_allocate=no fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 -$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } -if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 -$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } - +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then - : -else - { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 -$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} - { (exit 1); exit 1; }; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_allocate" >&5 +$as_echo "$ac_cv_lib_gfortran__gfortran_allocate" >&6; } +if test "x$ac_cv_lib_gfortran__gfortran_allocate" = x""yes; then + found=1 fi - - if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 -$as_echo_n "checking for boost/type_traits.hpp... " >&6; } -if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for _gfortran_st_write_done in -lgfortran" >&5 +$as_echo_n "checking for _gfortran_st_write_done in -lgfortran... " >&6; } +if test "${ac_cv_lib_gfortran__gfortran_st_write_done+set}" = set; then $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 -$as_echo "$ac_cv_header_boost_type_traits_hpp" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/type_traits.hpp usability" >&5 -$as_echo_n "checking boost/type_traits.hpp usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgfortran $LIBS" 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 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char _gfortran_st_write_done (); +int +main () +{ +return _gfortran_st_write_done (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -11714,290 +11838,267 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_gfortran__gfortran_st_write_done=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_lib_gfortran__gfortran_st_write_done=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_st_write_done" >&5 +$as_echo "$ac_cv_lib_gfortran__gfortran_st_write_done" >&6; } +if test "x$ac_cv_lib_gfortran__gfortran_st_write_done" = x""yes; then + found=1 +fi -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/type_traits.hpp presence" >&5 -$as_echo_n "checking boost/type_traits.hpp presence... " >&6; } -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 { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi + if test "x$found" = "x1" ; then + F77LIBS="$F77LIBS -lgfortran" + fi + ;; -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } + AIXF77) + F77FLAGSG="$FFLAGS -g -qextname" + F77FLAGSO="$FFLAGS -O3 -w -qextname" + F77LIBS="$F77LIBS -lxlf90" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 -$as_echo_n "checking for boost/type_traits.hpp... " >&6; } -if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_boost_type_traits_hpp=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 -$as_echo "$ac_cv_header_boost_type_traits_hpp" >&6; } + F77FLAGSPIC="unknown!" + ;; -fi -if test "x$ac_cv_header_boost_type_traits_hpp" = x""yes; then - : -else - { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 -$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + SunF77) + F77FLAGSG="$FFLAGS -silent -g" + F77FLAGSO="$FFLAGS -silent -O3 -w" + F77LIBS="$F77LIBS -lF77 -lsunmath -lM77" + F77FLAGSPIC="-PIC" + ;; + + MIPSproF77) + F77FLAGSG="$FFLAGS -ansi -g" + F77FLAGSO="$FFLAGS -O3 -woffall" + F77LIBS="$F77LIBS -lftn" + + F77FLAGSPIC="shared -KPIC" + ;; + + INTEL_F77*) + F77FLAGSG="$FFLAGS" + F77FLAGSO="$FFLAGS -O3" + ;; + + UnknownF77) + F77="UnknownF77" + F77FLAGSG="$FFLAGS -g" + F77FLAGSO="$FFLAGS -O2" + F77LIBS="$F77LIBS" + + F77FLAGSPIC="unknown!" + { $as_echo "$as_me:$LINENO: result: Unknown FORTRAN compiler has been disabled!" >&5 +$as_echo "Unknown FORTRAN compiler has been disabled!" >&6; } + ;; + + *) + { { $as_echo "$as_me:$LINENO: error: No compiler options for F77 compiler + \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" >&5 +$as_echo "$as_me: error: No compiler options for F77 compiler + \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" >&2;} { (exit 1); exit 1; }; } + ;; + esac + fi - if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 -$as_echo_n "checking for boost/tuple/tuple.hpp... " >&6; } -if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 -$as_echo "$ac_cv_header_boost_tuple_tuple_hpp" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp usability" >&5 -$as_echo_n "checking boost/tuple/tuple.hpp usability... " >&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 -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + + + + + + + + + +{ $as_echo "$as_me:$LINENO: result: " >&5 +$as_echo "" >&6; } +{ $as_echo "$as_me:$LINENO: result: ---------------- configuring shared/static libs -------------" >&5 +$as_echo "---------------- configuring shared/static libs -------------" >&6; } + +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; enableshared="$enableval" +else + enableshared=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp presence" >&5 -$as_echo_n "checking boost/tuple/tuple.hpp presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +case "$target" in + *-aix4* | alpha*-linux* | alpha*-osf45* | hppa64-unknown-linux-gnu ) + { $as_echo "$as_me:$LINENO: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 +$as_echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} + enableshared=no + ;; + *cygwin ) + shared_lib_suffix=".dll" + cygwin_shared_lib="yes" + ;; + *-apple-darwin* ) + shared_lib_suffix=".dylib" + darwin_shared_lib="yes" + ;; + * ) + shared_lib_suffix=".so" + static_lib_suffix=".a" + ;; +esac + +if test "x$enableshared" = "xyes" ; then + CFLAGS="$CFLAGS $CFLAGSPIC" + CXXFLAGSG="$CXXFLAGSG $CXXFLAGSPIC" + CXXFLAGSO="$CXXFLAGSO $CXXFLAGSPIC" + F77FLAGSG="$F77FLAGSG $F77FLAGSPIC" + F77FLAGSO="$F77FLAGSO $F77FLAGSPIC" + SHLIBFLAGS="-shared" + + case "$target" in + *-apple-darwin* ) + SHLIBFLAGS="-dynamiclib" + + { $as_echo "$as_me:$LINENO: checking for dynamic_cast problem with shared libs" >&5 +$as_echo_n "checking for dynamic_cast problem with shared libs... " >&6; } + + if (cd contrib/config/tests/darwin-dynamic-cast ; \ + $CXX -dynamiclib BaseClass.cpp -o libDynamicCastTestLib.dylib ; \ + $CXX -L. -lDynamicCastTestLib main.cc -o main ; \ + ./main) ; then + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ; + else + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } ; + +cat >>confdefs.h <<\_ACEOF +#define DEAL_II_HAVE_DARWIN_DYNACAST_BUG 1 +_ACEOF + + CXXFLAGSG="$CXXFLAGSG -mmacosx-version-min=10.4" + CXXFLAGSO="$CXXFLAGSO -mmacosx-version-min=10.4" + LDFLAGS="$LDFLAGS -mmacosx-version-min=10.4" + fi + rm -f contrib/config/tests/darwin-dynamic-cast/libDynamicCastTestLib.dylib + rm -f contrib/config/tests/darwin-dynamic-cast/main.o + rm -f contrib/config/tests/darwin-dynamic-cast/main + + ;; + esac + + case "${GXX_VERSION}" in + ibm_xlc* ) + SHLIBFLAGS="-qmkshrobj" + ;; + esac + + + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,-soname,libbase.so.6.2.1 $LDFLAGS $LDFLAGSPIC $SHLIBFLAGS" + { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-soname" >&5 +$as_echo_n "checking whether compiler understands option -Wl,-soname... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + +int +main () +{ + + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + DEAL_II_LD_UNDERSTANDS_SONAME="yes" + else $as_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 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + DEAL_II_LD_UNDERSTANDS_SONAME="no" -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to dealii@dealii.org ## -## -------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 -$as_echo_n "checking for boost/tuple/tuple.hpp... " >&6; } -if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_boost_tuple_tuple_hpp=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 -$as_echo "$ac_cv_header_boost_tuple_tuple_hpp" >&6; } -fi -if test "x$ac_cv_header_boost_tuple_tuple_hpp" = x""yes; then - : -else - { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 -$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} - { (exit 1); exit 1; }; } fi +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$OLD_LDFLAGS" - if test "x$GXX" = "xyes" ; then - { $as_echo "$as_me:$LINENO: checking for boost::shared_ptr assignment operator= template buglet" >&5 -$as_echo_n "checking for boost::shared_ptr assignment operator= template buglet... " >&6; } - ac_ext=cpp -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 - - CXXFLAGS="-Wsynth -Werror" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" + { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dynamic,-install_name" >&5 +$as_echo_n "checking whether compiler understands option -Wl,-dynamic,-install_name... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# include - int main () { - boost::shared_ptr a,b; - a = b; - ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -12006,195 +12107,50 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="yes" else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - - - - - - -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring F77 compilers ------------------" >&5 -$as_echo "---------------- configuring F77 compilers ------------------" >&6; } - -for ac_prog in gfortran f77 g77 -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_F77+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $F77 in - [\\/]* | ?:[\\/]*) - ac_cv_path_F77="$F77" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_F77="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -F77=$ac_cv_path_F77 -if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 -$as_echo "$F77" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } -fi - - - test -n "$F77" && break -done - - -if test "x$F77" != "x" ; then - - if test "x$F77" != "x" ; then - - F77_VERSION_STRING="`($F77 -v 2>&1) | head -n 10`" - if test -n "`echo $F77_VERSION_STRING | grep \"GNU F77\"`" -o \ - -n "`echo $F77_VERSION_STRING | grep \"gcc version\"`" ; then - G77_VERSION_STRING="`($F77 -v 2>&1) | grep \"gcc version\"`" - - full_version=`echo "$G77_VERSION_STRING" | perl -pi -e 's/.*version (\d\.\d\.\d).*/\1/g;'` - F77_VERSION=gcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` - - { $as_echo "$as_me:$LINENO: result: F77 compiler is $CC_VERSION" >&5 -$as_echo "F77 compiler is $CC_VERSION" >&6; } - - else - - if test -n "`echo $F77_VERSION_STRING | grep \"XL Fortran for AIX\"`" ; then - - F77_VERSION=AIXF77 - { $as_echo "$as_me:$LINENO: result: F77 compiler is AIX Fortran77" >&5 -$as_echo "F77 compiler is AIX Fortran77" >&6; } - - else - - F77_VERSION_STRING=`($F77 -V 2>&1)` - if test -n "`echo $F77_VERSION_STRING | grep \"WorkShop Compilers\"`" \ - -o \ - -n "`echo $F77_VERSION_STRING | grep \"Sun WorkShop\"`" \ - -o \ - -n "`echo $F77_VERSION_STRING | grep \"Forte Developer\"`" ; then - { $as_echo "$as_me:$LINENO: result: F77 compiler is Sun WorkShop f77" >&5 -$as_echo "F77 compiler is Sun WorkShop f77" >&6; } - F77_VERSION="SunF77" - - else - - F77_VERSION_STRING=`($F77 -version 2>&1)` - if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then - { $as_echo "$as_me:$LINENO: result: F77 compiler is MIPSpro f77" >&5 -$as_echo "F77 compiler is MIPSpro f77" >&6; } - F77_VERSION="MIPSproF77" - - else - - F77_VERSION_STRING=`($F77 -V 2>&1)` - is_intel_ifc="`echo $F77_VERSION_STRING | grep 'Intel(R) Fortran'`" - if test "x$is_intel_ifc" != "x" ; then - { $as_echo "$as_me:$LINENO: result: F77 compiler is Intel Fortran" >&5 -$as_echo "F77 compiler is Intel Fortran" >&6; } - F77_VERSION=INTEL_F77 - - else - - - F77_VERSION="UnknownF77" - { $as_echo "$as_me:$LINENO: result: F77 compiler is unkown. no flags set!" >&5 -$as_echo "F77 compiler is unkown. no flags set!" >&6; } - fi - fi - fi - fi - fi - fi + DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="no" - case "$F77_VERSION" in - gcc*) - F77FLAGSG="$FFLAGS -ggdb -DDEBUG -pedantic -W -Wall" - F77FLAGSO="$FFLAGS -O2 -funroll-loops -funroll-all-loops -fstrict-aliasing" +fi - case "$target" in - *cygwin* ) - F77FLAGSPIC= - ;; +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$OLD_LDFLAGS" - *apple-darwin*) - if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then - F77FLAGSG="$F77FLAGSG -m64" - F77FLAGSO="$F77FLAGSO -m64" - fi - ;; - * ) - F77FLAGSPIC="-fPIC" - ;; - esac +fi - { $as_echo "$as_me:$LINENO: checking for e_wsfe in -lg2c" >&5 -$as_echo_n "checking for e_wsfe in -lg2c... " >&6; } -if test "${ac_cv_lib_g2c_e_wsfe+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lg2c $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" + { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-rpath" >&5 +$as_echo_n "checking whether compiler understands option -Wl,-rpath... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char e_wsfe (); int main () { -return e_wsfe (); + ; return 0; } @@ -12220,402 +12176,400 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_g2c_e_wsfe=yes + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + LD_PATH_OPTION="-Wl,-rpath " else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_g2c_e_wsfe=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + LDFLAGS="$OLD_LDFLAGS" + LD_PATH_OPTION="no" fi rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + + + + + + + +# Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="ar" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_g2c_e_wsfe" >&5 -$as_echo "$ac_cv_lib_g2c_e_wsfe" >&6; } -if test "x$ac_cv_lib_g2c_e_wsfe" = x""yes; then - F77LIBS="$F77LIBS -lg2c" +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:$LINENO: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - { $as_echo "$as_me:$LINENO: checking for _gfortran_allocate in -lgfortran" >&5 -$as_echo_n "checking for _gfortran_allocate in -lgfortran... " >&6; } -if test "${ac_cv_lib_gfortran__gfortran_allocate+set}" = set; then +# Extract the first word of "$AR", so it can be a program name with args. +set dummy $AR; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_AR+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgfortran $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 GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _gfortran_allocate (); -int -main () -{ -return _gfortran_allocate (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + case $AR in + [\\/]* | ?:[\\/]*) + ac_cv_path_AR="$AR" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_gfortran__gfortran_allocate=yes +fi +AR=$ac_cv_path_AR +if test -n "$AR"; then + { $as_echo "$as_me:$LINENO: result: $AR" >&5 +$as_echo "$AR" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gfortran__gfortran_allocate=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_allocate" >&5 -$as_echo "$ac_cv_lib_gfortran__gfortran_allocate" >&6; } -if test "x$ac_cv_lib_gfortran__gfortran_allocate" = x""yes; then - found=1 -fi - { $as_echo "$as_me:$LINENO: checking for _gfortran_st_write_done in -lgfortran" >&5 -$as_echo_n "checking for _gfortran_st_write_done in -lgfortran... " >&6; } -if test "${ac_cv_lib_gfortran__gfortran_st_write_done+set}" = set; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgfortran $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 -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _gfortran_st_write_done (); -int -main () -{ -return _gfortran_st_write_done (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_gfortran__gfortran_st_write_done=yes +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + - ac_cv_lib_gfortran__gfortran_st_write_done=no fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gfortran__gfortran_st_write_done" >&5 -$as_echo "$ac_cv_lib_gfortran__gfortran_st_write_done" >&6; } -if test "x$ac_cv_lib_gfortran__gfortran_st_write_done" = x""yes; then - found=1 +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi - if test "x$found" = "x1" ; then - F77LIBS="$F77LIBS -lgfortran" - fi - ;; - - AIXF77) - F77FLAGSG="$FFLAGS -g -qextname" - F77FLAGSO="$FFLAGS -O3 -w -qextname" - F77LIBS="$F77LIBS -lxlf90" +if test "$RANLIB" != ":" ; then + # Extract the first word of "$RANLIB", so it can be a program name with args. +set dummy $RANLIB; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $RANLIB in + [\\/]* | ?:[\\/]*) + ac_cv_path_RANLIB="$RANLIB" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - F77FLAGSPIC="unknown!" - ;; + ;; +esac +fi +RANLIB=$ac_cv_path_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi - SunF77) - F77FLAGSG="$FFLAGS -silent -g" - F77FLAGSO="$FFLAGS -silent -O3 -w" - F77LIBS="$F77LIBS -lF77 -lsunmath -lM77" - F77FLAGSPIC="-PIC" - ;; - MIPSproF77) - F77FLAGSG="$FFLAGS -ansi -g" - F77FLAGSO="$FFLAGS -O3 -woffall" - F77LIBS="$F77LIBS -lftn" +fi - F77FLAGSPIC="shared -KPIC" - ;; - INTEL_F77*) - F77FLAGSG="$FFLAGS" - F77FLAGSO="$FFLAGS -O3" - ;; - UnknownF77) - F77="UnknownF77" - F77FLAGSG="$FFLAGS -g" - F77FLAGSO="$FFLAGS -O2" - F77LIBS="$F77LIBS" - F77FLAGSPIC="unknown!" - { $as_echo "$as_me:$LINENO: result: Unknown FORTRAN compiler has been disabled!" >&5 -$as_echo "Unknown FORTRAN compiler has been disabled!" >&6; } - ;; - *) - { { $as_echo "$as_me:$LINENO: error: No compiler options for F77 compiler - \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" >&5 -$as_echo "$as_me: error: No compiler options for F77 compiler - \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" >&2;} - { (exit 1); exit 1; }; } - ;; - esac +{ $as_echo "$as_me:$LINENO: result: " >&5 +$as_echo "" >&6; } +{ $as_echo "$as_me:$LINENO: result: ---------------- configuring optional features --------------" >&5 +$as_echo "---------------- configuring optional features --------------" >&6; } -fi +# Check whether --enable-parser was given. +if test "${enable_parser+set}" = set; then + enableval=$enable_parser; enableparser="$enableval" + if test "x$enableval" = "xno" ; then + { $as_echo "$as_me:$LINENO: result: Function parser disabled" >&5 +$as_echo "Function parser disabled" >&6; } +cat >>confdefs.h <<\_ACEOF +#define DEAL_II_DISABLE_PARSER 1 +_ACEOF + else + { $as_echo "$as_me:$LINENO: result: Function parser enabled" >&5 +$as_echo "Function parser enabled" >&6; } + fi +else + enableparser=yes +fi +# Check whether --enable-mgcompatibility was given. +if test "${enable_mgcompatibility+set}" = set; then + enableval=$enable_mgcompatibility; if test "x$enableval" = "xyes" ; then + { $as_echo "$as_me:$LINENO: result: enable multigrid compatibility mode" >&5 +$as_echo "enable multigrid compatibility mode" >&6; } +cat >>confdefs.h <<\_ACEOF +#define DEAL_II_MULTIGRID_COMPATIBILITY 1 +_ACEOF + fi +fi -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring shared/static libs -------------" >&5 -$as_echo "---------------- configuring shared/static libs -------------" >&6; } -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; enableshared="$enableval" + # Check whether --enable-compat-blocker was given. +if test "${enable_compat_blocker+set}" = set; then + enableval=$enable_compat_blocker; enable_compat_blocker="$enableval" else - enableshared=yes + enable_compat_blocker="" fi -case "$target" in - *-aix4* | alpha*-linux* | alpha*-osf45* | hppa64-unknown-linux-gnu ) - { $as_echo "$as_me:$LINENO: WARNING: Shared libraries not supported on $target. Using static libs instead" >&5 -$as_echo "$as_me: WARNING: Shared libraries not supported on $target. Using static libs instead" >&2;} - enableshared=no - ;; - *cygwin ) - shared_lib_suffix=".dll" - cygwin_shared_lib="yes" - ;; - *-apple-darwin* ) - shared_lib_suffix=".dylib" - darwin_shared_lib="yes" - ;; - * ) - shared_lib_suffix=".so" - static_lib_suffix=".a" - ;; -esac - -if test "x$enableshared" = "xyes" ; then - CFLAGS="$CFLAGS $CFLAGSPIC" - CXXFLAGSG="$CXXFLAGSG $CXXFLAGSPIC" - CXXFLAGSO="$CXXFLAGSO $CXXFLAGSPIC" - F77FLAGSG="$F77FLAGSG $F77FLAGSPIC" - F77FLAGSO="$F77FLAGSO $F77FLAGSPIC" - SHLIBFLAGS="-shared" + disable_compat=`echo $enable_compat_blocker | perl -pi -e 's/,/ /g;'` - case "$target" in - *-apple-darwin* ) - SHLIBFLAGS="-dynamiclib" + for i in $disable_compat ; do + case $i in + mapping) + { $as_echo "$as_me:$LINENO: result: Disabling backward compatibility feature: \"$i\"" >&5 +$as_echo "Disabling backward compatibility feature: \"$i\"" >&6; } + ;; + *) + { { $as_echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 +$as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + done - { $as_echo "$as_me:$LINENO: checking for dynamic_cast problem with shared libs" >&5 -$as_echo_n "checking for dynamic_cast problem with shared libs... " >&6; } + for i in mapping ; do + uppercase=`echo $i | perl -pi -e 'tr/a-z/A-Z/;'` + if test -n "`echo $disable_compat | grep $i`" ; then + compat_value=false + else + compat_value=true + fi - if (cd contrib/config/tests/darwin-dynamic-cast ; \ - $CXX -dynamiclib BaseClass.cpp -o libDynamicCastTestLib.dylib ; \ - $CXX -L. -lDynamicCastTestLib main.cc -o main ; \ - ./main) ; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } ; - else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } ; + case $i in + mapping) -cat >>confdefs.h <<\_ACEOF -#define DEAL_II_HAVE_DARWIN_DYNACAST_BUG 1 +cat >>confdefs.h <<_ACEOF +#define DEAL_II_COMPAT_MAPPING $compat_value _ACEOF - CXXFLAGSG="$CXXFLAGSG -mmacosx-version-min=10.4" - CXXFLAGSO="$CXXFLAGSO -mmacosx-version-min=10.4" - LDFLAGS="$LDFLAGS -mmacosx-version-min=10.4" - fi - rm -f contrib/config/tests/darwin-dynamic-cast/libDynamicCastTestLib.dylib - rm -f contrib/config/tests/darwin-dynamic-cast/main.o - rm -f contrib/config/tests/darwin-dynamic-cast/main - - ;; - esac + ;; - case "${GXX_VERSION}" in - ibm_xlc* ) - SHLIBFLAGS="-qmkshrobj" - ;; - esac + *) + { { $as_echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 +$as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + done - OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,-soname,libbase.so.6.2.1 $LDFLAGS $LDFLAGSPIC $SHLIBFLAGS" - { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-soname" >&5 -$as_echo_n "checking whether compiler understands option -Wl,-soname... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - DEAL_II_LD_UNDERSTANDS_SONAME="yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +{ $as_echo "$as_me:$LINENO: result: " >&5 +$as_echo "" >&6; } +{ $as_echo "$as_me:$LINENO: result: ---------------- configuring additional libs ----------------" >&5 +$as_echo "---------------- configuring additional libs ----------------" >&6; } +BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include" - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - DEAL_II_LD_UNDERSTANDS_SONAME="no" +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then + withval=$with_boost; + if test "x$withval" != "xyes" ; then + BOOST_INCLUDE_DIR="-I$withval" + if test "$LD_PATH_OPTION" != "no" ; then + BOOST_LIB_DIR="$LD_PATH_OPTION$withval/lib" + fi + else + BOOST_INCLUDE_DIR='' + BOOST_LIB_DIR='' + fi fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$OLD_LDFLAGS" + CPPFLAGS="$BOOST_INCLUDE_DIR $CPPFLAGS" + LDFLAGS="$BOOST_LIB_DIR $LDFLAGS" - OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" - { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dynamic,-install_name" >&5 -$as_echo_n "checking whether compiler understands option -Wl,-dynamic,-install_name... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ + if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } +if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 +$as_echo_n "checking boost/shared_ptr.hpp usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +$ac_includes_default +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -12624,416 +12578,460 @@ $as_echo "$ac_try_echo") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="yes" - + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME="no" - - + ac_header_compiler=no fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$OLD_LDFLAGS" - - -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } - OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,-rpath,$DEAL_II_PATH/lib $LDFLAGS" - { $as_echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-rpath" >&5 -$as_echo_n "checking whether compiler understands option -Wl,-rpath... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 +$as_echo_n "checking boost/shared_ptr.hpp presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (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 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - LD_PATH_OPTION="-Wl,-rpath " -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - LDFLAGS="$OLD_LDFLAGS" - LD_PATH_OPTION="no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - - - - - - -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "$AR", so it can be a program name with args. -set dummy $AR; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_AR+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $AR in - [\\/]* | ?:[\\/]*) - ac_cv_path_AR="$AR" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -AR=$ac_cv_path_AR -if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + ac_header_preproc=yes +else + $as_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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to dealii@dealii.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +$as_echo_n "checking for boost/shared_ptr.hpp... " >&6; } +if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - + ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +$as_echo "$ac_cv_header_boost_shared_ptr_hpp" >&6; } + fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } +if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then + : else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 +$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + { (exit 1); exit 1; }; } fi - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi -if test "$RANLIB" != ":" ; then - # Extract the first word of "$RANLIB", so it can be a program name with args. -set dummy $RANLIB; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_RANLIB+set}" = set; then + if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 +$as_echo_n "checking for boost/type_traits.hpp... " >&6; } +if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 +$as_echo "$ac_cv_header_boost_type_traits_hpp" >&6; } else - case $RANLIB in - [\\/]* | ?:[\\/]*) - ac_cv_path_RANLIB="$RANLIB" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking boost/type_traits.hpp usability" >&5 +$as_echo_n "checking boost/type_traits.hpp usability... " >&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 +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -RANLIB=$ac_cv_path_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking boost/type_traits.hpp presence" >&5 +$as_echo_n "checking boost/type_traits.hpp presence... " >&6; } +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 { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_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 +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring optional features --------------" >&5 -$as_echo "---------------- configuring optional features --------------" >&6; } - -# Check whether --enable-parser was given. -if test "${enable_parser+set}" = set; then - enableval=$enable_parser; enableparser="$enableval" - if test "x$enableval" = "xno" ; then - { $as_echo "$as_me:$LINENO: result: Function parser disabled" >&5 -$as_echo "Function parser disabled" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define DEAL_II_DISABLE_PARSER 1 -_ACEOF - - else - { $as_echo "$as_me:$LINENO: result: Function parser enabled" >&5 -$as_echo "Function parser enabled" >&6; } - fi +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/type_traits.hpp: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to dealii@dealii.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for boost/type_traits.hpp" >&5 +$as_echo_n "checking for boost/type_traits.hpp... " >&6; } +if test "${ac_cv_header_boost_type_traits_hpp+set}" = set; then + $as_echo_n "(cached) " >&6 else - enableparser=yes + ac_cv_header_boost_type_traits_hpp=$ac_header_preproc fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_type_traits_hpp" >&5 +$as_echo "$ac_cv_header_boost_type_traits_hpp" >&6; } +fi +if test "x$ac_cv_header_boost_type_traits_hpp" = x""yes; then + : +else + { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 +$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + { (exit 1); exit 1; }; } +fi + if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 +$as_echo_n "checking for boost/tuple/tuple.hpp... " >&6; } +if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then + $as_echo_n "(cached) " >&6 +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 +$as_echo "$ac_cv_header_boost_tuple_tuple_hpp" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp usability" >&5 +$as_echo_n "checking boost/tuple/tuple.hpp usability... " >&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 +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -# Check whether --enable-mgcompatibility was given. -if test "${enable_mgcompatibility+set}" = set; then - enableval=$enable_mgcompatibility; if test "x$enableval" = "xyes" ; then - { $as_echo "$as_me:$LINENO: result: enable multigrid compatibility mode" >&5 -$as_echo "enable multigrid compatibility mode" >&6; } - -cat >>confdefs.h <<\_ACEOF -#define DEAL_II_MULTIGRID_COMPATIBILITY 1 +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking boost/tuple/tuple.hpp presence" >&5 +$as_echo_n "checking boost/tuple/tuple.hpp presence... " >&6; } +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 { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&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 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: boost/tuple/tuple.hpp: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## -------------------------------- ## +## Report this to dealii@dealii.org ## +## -------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for boost/tuple/tuple.hpp" >&5 +$as_echo_n "checking for boost/tuple/tuple.hpp... " >&6; } +if test "${ac_cv_header_boost_tuple_tuple_hpp+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_header_boost_tuple_tuple_hpp=$ac_header_preproc +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_boost_tuple_tuple_hpp" >&5 +$as_echo "$ac_cv_header_boost_tuple_tuple_hpp" >&6; } - # Check whether --enable-compat-blocker was given. -if test "${enable_compat_blocker+set}" = set; then - enableval=$enable_compat_blocker; enable_compat_blocker="$enableval" +fi +if test "x$ac_cv_header_boost_tuple_tuple_hpp" = x""yes; then + : else - enable_compat_blocker="" + { { $as_echo "$as_me:$LINENO: error: Your boost installation is incomplete!" >&5 +$as_echo "$as_me: error: Your boost installation is incomplete!" >&2;} + { (exit 1); exit 1; }; } fi - disable_compat=`echo $enable_compat_blocker | perl -pi -e 's/,/ /g;'` - for i in $disable_compat ; do - case $i in - mapping) - { $as_echo "$as_me:$LINENO: result: Disabling backward compatibility feature: \"$i\"" >&5 -$as_echo "Disabling backward compatibility feature: \"$i\"" >&6; } - ;; - *) - { { $as_echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 -$as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - done + if test "x$GXX" = "xyes" ; then + { $as_echo "$as_me:$LINENO: checking for boost::shared_ptr assignment operator= template buglet" >&5 +$as_echo_n "checking for boost::shared_ptr assignment operator= template buglet... " >&6; } + ac_ext=cpp +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 - for i in mapping ; do - uppercase=`echo $i | perl -pi -e 'tr/a-z/A-Z/;'` - if test -n "`echo $disable_compat | grep $i`" ; then - compat_value=false - else - compat_value=true - fi + CXXFLAGS="-Wsynth -Werror" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - case $i in - mapping) +# include -cat >>confdefs.h <<_ACEOF -#define DEAL_II_COMPAT_MAPPING $compat_value +int +main () +{ + + boost::shared_ptr a,b; + a = b; + + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then - ;; + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - *) - { { $as_echo "$as_me:$LINENO: error: Backward compatibility feature \"$i\" unknown" >&5 -$as_echo "$as_me: error: Backward compatibility feature \"$i\" unknown" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - done + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ $as_echo "$as_me:$LINENO: result: " >&5 -$as_echo "" >&6; } -{ $as_echo "$as_me:$LINENO: result: ---------------- configuring additional libs ----------------" >&5 -$as_echo "---------------- configuring additional libs ----------------" >&6; } { $as_echo "$as_me:$LINENO: checking for PETSc library directory" >&5 diff --git a/deal.II/configure.in b/deal.II/configure.in index 1b52a09998..5becb1367c 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -214,13 +214,6 @@ AC_CHECK_FUNCS_ONCE([gethostname getpid]) AC_CHECK_HEADERS_ONCE([sys/syscall.h]) DEAL_II_CHECK_BROKEN_SOCKETS -dnl Check for boost option and make sure we get all files -BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include" - -DEAL_II_CHECK_BOOST - -AC_SUBST(BOOST_INCLUDE_DIR) - dnl ------------------------------------------------------------- dnl Fortran 77 compilers @@ -403,6 +396,14 @@ dnl ------------------------------------------------------------- AC_MSG_RESULT() AC_MSG_RESULT(---------------- configuring additional libs ----------------) +dnl Check for boost option and make sure we get all files. +dnl Since we may want to use an external boost installation +dnl this test needs to run after we determine whether -rpath +dnl works +BOOST_INCLUDE_DIR="-I$DEAL_II_PATH/contrib/boost/include" +DEAL_II_CHECK_BOOST +AC_SUBST(BOOST_INCLUDE_DIR) + DEAL_II_CONFIGURE_PETSC AC_SUBST(USE_CONTRIB_PETSC) AC_SUBST(DEAL_II_PETSC_DIR) diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 0e700e21a2..25736ff7ee 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -38,7 +38,13 @@ inconvenience this causes.

General

    -
  1. None so far. +
  2. +

    Fixed: Configuring with an external BOOST version did not work when + using shared libraries since the test ran in the wrong order with respect + to another configure test. This is now fixed. +
    + (Bradley Froehle 2010/06/29) +

-- 2.39.5