From f8cba720ba0e86d9244920f884bec8274b6fde7f Mon Sep 17 00:00:00 2001 From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d> Date: Fri, 13 Jul 2012 20:08:04 +0000 Subject: [PATCH] Regenerate. git-svn-id: https://svn.dealii.org/trunk@25698 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 1467 +++++++++++++++++++++++---------------------- 1 file changed, 735 insertions(+), 732 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index 1bfe85c80a..7683f13d51 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 25636 . +# From configure.in Revision: 25657 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.2.pre. # @@ -3908,26 +3908,26 @@ $as_echo "C++ compiler is MIPSpro compiler 7.5" >&6; } $as_echo "C++ compiler is unknown version but accepted MIPSpro compiler version" >&6; } GXX_VERSION=MIPSpro-other GXX_VERSION_DETAILED="$GXX_VERSION" - ;; + ;; esac else - is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel'`" + is_intel_icc1="`($CXX -V 2>&1) | grep 'Intel'`" is_intel_icc2="`($CXX -help 2>&1) | grep 'Intel'`" - is_intel_icc="$is_intel_icc1$is_intel_icc2" + is_intel_icc="$is_intel_icc1$is_intel_icc2" - is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" + is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x" ; then - GXX_BRAND=Intel - version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`" - version5="`echo $version_string | grep 'Version 5'`" - version6="`echo $version_string | grep 'Version 6'`" - version7="`echo $version_string | grep 'Version 7'`" - version8="`echo $version_string | grep 'Version 8'`" - version9="`echo $version_string | grep 'Version 9'`" - version10="`echo $version_string | grep 'Version 10'`" - version11="`echo $version_string | grep 'Version 11'`" + GXX_BRAND=Intel + version_string="`($CXX -V 2>&1) | grep 'Version'` `($CXX -help 2>&1) | grep 'Version'`" + version5="`echo $version_string | grep 'Version 5'`" + version6="`echo $version_string | grep 'Version 6'`" + version7="`echo $version_string | grep 'Version 7'`" + version8="`echo $version_string | grep 'Version 8'`" + version9="`echo $version_string | grep 'Version 9'`" + version10="`echo $version_string | grep 'Version 10'`" + version11="`echo $version_string | grep 'Version 11'`" if test "x$version5" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is icc-5" >&5 $as_echo "C++ compiler is icc-5" >&6; } @@ -3977,7 +3977,7 @@ $as_echo "C++ compiler is Compaq-cxx" >&6; } GXX_VERSION_DETAILED="$GXX_VERSION" else - is_sun_cc_1="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" + is_sun_cc_1="`($CXX -V 2>&1) | grep 'Sun WorkShop'`" is_sun_cc_2="`($CXX -V 2>&1) | grep 'Sun C++'`" if test "x$is_sun_cc_1$is_sun_cc_2" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Sun Workshop compiler" >&5 @@ -3987,7 +3987,7 @@ $as_echo "C++ compiler is Sun Workshop compiler" >&6; } GXX_VERSION_DETAILED="$GXX_VERSION" else - is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" + is_sun_forte_cc="`($CXX -V 2>&1) | grep 'Forte'`" if test "x$is_sun_forte_cc" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Sun Forte compiler" >&5 $as_echo "C++ compiler is Sun Forte compiler" >&6; } @@ -3996,77 +3996,77 @@ $as_echo "C++ compiler is Sun Forte compiler" >&6; } GXX_VERSION_DETAILED="$GXX_VERSION" else - is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" - if test "x$is_pgcc" != "x" ; then - GXX_VERSION_STRING=`($CXX -V 2>&1) | grep "^pgCC"` + is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" + if test "x$is_pgcc" != "x" ; then + GXX_VERSION_STRING=`($CXX -V 2>&1) | grep "^pgCC"` full_version=`echo "$GXX_VERSION_STRING" | perl -pi -e 's/.*pgCC\s+(\S+).*/\1/g;'` - GXX_BRAND=PortlandGroup - GXX_VERSION=pgCC`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` - GXX_VERSION_DETAILED=pgCC"$full_version" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Portland Group C++ $full_version" >&5 + GXX_BRAND=PortlandGroup + GXX_VERSION=pgCC`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + GXX_VERSION_DETAILED=pgCC"$full_version" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Portland Group C++ $full_version" >&5 $as_echo "C++ compiler is Portland Group C++ $full_version" >&6; } else - is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" - if test "x$is_aCC" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is HP aCC" >&5 + is_aCC="`($CXX -V 2>&1) | grep 'aCC'`" + if test "x$is_aCC" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is HP aCC" >&5 $as_echo "C++ compiler is HP aCC" >&6; } - GXX_BRAND=HP + GXX_BRAND=HP GXX_VERSION=hp_aCC - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_VERSION_DETAILED="$GXX_VERSION" else - is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" - if test "x$is_bcc" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Borland C++" >&5 + is_bcc="`($CXX -h 2>&1) | grep 'Borland'`" + if test "x$is_bcc" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Borland C++" >&5 $as_echo "C++ compiler is Borland C++" >&6; } - GXX_BRAND=Borland - GXX_VERSION=borland_bcc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_BRAND=Borland + GXX_VERSION=borland_bcc + GXX_VERSION_DETAILED="$GXX_VERSION" else - is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" - is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" - if test "x$is_kai_cc" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is KAI C++" >&5 + is_kai_cc="`($CXX --version 2>&1) | grep 'KAI C++'`" + is_kai_cc="$is_kai_cc`($CXX -v 2>&1) | grep /KCC/`" + if test "x$is_kai_cc" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is KAI C++" >&5 $as_echo "C++ compiler is KAI C++" >&6; } - GXX_BRAND=KAI - GXX_VERSION=kai_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_BRAND=KAI + GXX_VERSION=kai_cc + GXX_VERSION_DETAILED="$GXX_VERSION" else is_pathscale="`($CXX -v 2>&1) | grep PathScale`" if test "x$is_pathscale" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is PathScale C++" >&5 $as_echo "C++ compiler is PathScale C++" >&6; } - GXX_BRAND=PathScale - GXX_VERSION=pathscale_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_BRAND=PathScale + GXX_VERSION=pathscale_cc + GXX_VERSION_DETAILED="$GXX_VERSION" else - is_clang="`($CXX --version 2>&1) | grep clang`" - if test "x$is_clang" != x ; then + is_clang="`($CXX --version 2>&1) | grep clang`" + if test "x$is_clang" != x ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is clang" >&5 $as_echo "C++ compiler is clang" >&6; } - GXX_BRAND=clang - GXX_VERSION=clang - GXX_VERSION_DETAILED="$GXX_VERSION" - else + GXX_BRAND=clang + GXX_VERSION=clang + GXX_VERSION_DETAILED="$GXX_VERSION" + else - is_cray="`($CXX -V 2>&1) | grep Cray`" - if test "x$is_cray" != x ; then + is_cray="`($CXX -V 2>&1) | grep Cray`" + if test "x$is_cray" != x ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Cray C++" >&5 $as_echo "C++ compiler is Cray C++" >&6; } - GXX_BRAND=cray - GXX_VERSION=cray - GXX_VERSION_DETAILED="$GXX_VERSION" - else + GXX_BRAND=cray + GXX_VERSION=cray + GXX_VERSION_DETAILED="$GXX_VERSION" + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 $as_echo "Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&6; } GXX_BRAND=Unknown - GXX_VERSION=unknown_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_VERSION=unknown_cc + GXX_VERSION_DETAILED="$GXX_VERSION" fi fi fi @@ -4075,7 +4075,7 @@ $as_echo "Unrecognized C++ compiler -- Try to go ahead and get help from dealii@ fi fi fi - fi + fi fi fi fi @@ -4095,7 +4095,7 @@ int main () { - MPI_Init (0,0); + MPI_Init (0,0); ; return 0; @@ -4109,7 +4109,7 @@ $as_echo "yes" >&6; } $as_echo "#define DEAL_II_COMPILER_SUPPORTS_MPI 1" >>confdefs.h - DEAL_II_COMPILER_SUPPORTS_MPI=1 + DEAL_II_COMPILER_SUPPORTS_MPI=1 DEAL_II_USE_MPI=yes else @@ -4458,8 +4458,8 @@ main () { std::vector<int> v; - auto i = v.begin(); - *i; + auto i = v.begin(); + *i; ; return 0; @@ -4485,8 +4485,8 @@ main () { std::vector<int> v; - for (std::vector<int>::iterator i : v) - *i; + for (std::vector<int>::iterator i : v) + *i; ; return 0; @@ -4587,33 +4587,33 @@ rm -f core conftest.err conftest.$ac_objext \ case "$target" in *aix* ) - CXXFLAGSPIC= - LDFLAGSPIC= + CXXFLAGSPIC= + LDFLAGSPIC= LDFLAGS="$LDFLAGS -lpthread" - ;; + ;; *dec-osf* ) - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" LDFLAGS="$LDFLAGS -lpthread" - ;; + ;; *x86_64*) - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" - LDFLAGS="$LDFLAGS -lpthread" - ;; + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" + LDFLAGS="$LDFLAGS -lpthread" + ;; *cygwin* ) - CXXFLAGSPIC= - LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition" + CXXFLAGSPIC= + LDFLAGS="$LDFLAGS -Xlinker --allow-multiple-definition" SHLIBFLAGS="$SHLIBFLAGS -Xlinker --allow-multiple-definition" ;; *) - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" - ;; + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" + ;; esac @@ -4646,13 +4646,13 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } DEAL_II_ADVANCE_WARNING=no else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } DEAL_II_ADVANCE_WARNING=yes @@ -4683,7 +4683,7 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -4719,8 +4719,8 @@ if ac_fn_cxx_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CXXFLAGSG="$CXXFLAGSG -Wno-long-double" - CXXFLAGSO="$CXXFLAGSO -Wno-long-double" + CXXFLAGSG="$CXXFLAGSG -Wno-long-double" + CXXFLAGSO="$CXXFLAGSO -Wno-long-double" else @@ -4743,12 +4743,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext *dec-osf*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for preprocessor warning with cuserid" >&5 $as_echo_n "checking for preprocessor warning with cuserid... " >&6; } - CXXFLAGS="$CXXFLAGSG -Werror" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CXXFLAGS="$CXXFLAGSG -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <stdio.h> -# include <unistd.h> +# include <stdio.h> +# include <unistd.h> int main () @@ -4782,7 +4782,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext case "$GXX_VERSION" in ibm_xlc) - CXXFLAGSG="$CXXFLAGSG -DDEBUG -check=bounds -info=all -qrtti=all -qsuppress=1540-2907 -qsuppress=1540-2909 -qxflag=EnableIssue214PartialOrdering -qxflag=IgnoreCVOnTopOfFunctionTypes" + CXXFLAGSG="$CXXFLAGSG -DDEBUG -check=bounds -info=all -qrtti=all -qsuppress=1540-2907 -qsuppress=1540-2909 -qxflag=EnableIssue214PartialOrdering -qxflag=IgnoreCVOnTopOfFunctionTypes" CXXFLAGSO="$CXXFLAGSO -O2 -w -qansialias -qrtti=all -qsuppress=1540-2907 -qsuppress=1540-2909 -qxflag=EnableIssue214PartialOrdering -qxflag=IgnoreCVOnTopOfFunctionTypes" CXXFLAGSPIC="-qpic" LDFLAGSPIC="-qpic" @@ -4800,49 +4800,49 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; clang*) - CXXFLAGSG="$CXXFLAGS -DDEBUG -g -Wall -Wno-array-bounds -Wno-parentheses -Wno-delete-non-virtual-dtor -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-variable" + CXXFLAGSG="$CXXFLAGS -DDEBUG -g -Wall -Wno-array-bounds -Wno-parentheses -Wno-delete-non-virtual-dtor -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-variable" CXXFLAGSO="$CXXFLAGS -O2 -Wno-array-bounds -Wno-parentheses -Wno-delete-non-virtual-dtor -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-variable" - CXXFLAGSPIC="-fPIC" - LDFLAGSPIC="-fPIC" - ;; + CXXFLAGSPIC="-fPIC" + LDFLAGSPIC="-fPIC" + ;; intel_icc*) - case "$GXX_VERSION" in - intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) - CXXFLAGSG="$CXXFLAGSG -Kc++eh -Krtti -DDEBUG -inline_debug_info" + case "$GXX_VERSION" in + intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + CXXFLAGSG="$CXXFLAGSG -Kc++eh -Krtti -DDEBUG -inline_debug_info" CXXFLAGSO="$CXXFLAGSO -Kc++eh -Krtti -O2 -unroll" CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-KPIC" ;; - intel_icc*) - CXXFLAGSG="$CXXFLAGSG -DDEBUG" + intel_icc*) + CXXFLAGSG="$CXXFLAGSG -DDEBUG" CXXFLAGSO="$CXXFLAGSO -O2 -unroll" CXXFLAGSPIC="-fPIC" - LDFLAGS="$LDFLAGS -lstdc++ -lpthread" + LDFLAGS="$LDFLAGS -lstdc++ -lpthread" LDFLAGSPIC="-fPIC" ;; esac - CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858" + CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858 -wd1565" CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11" - case "$GXX_VERSION" in - intel_icc5) + case "$GXX_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" ;; - *) - case "$target" in - *ia64*) - CXXFLAGSO="$CXXFLAGSO -opt-report 0" - ;; - *) - CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0" - ;; - esac - ;; + *) + case "$target" in + *ia64*) + CXXFLAGSO="$CXXFLAGSO -opt-report 0" + ;; + *) + CXXFLAGSO="$CXXFLAGSO -opt-report 0 -vec-report0" + ;; + esac + ;; esac @@ -4870,7 +4870,7 @@ if ac_fn_cxx_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CXXFLAGSG="$CXXFLAGSG -wd1572" + CXXFLAGSG="$CXXFLAGSG -wd1572" else @@ -4881,31 +4881,31 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$GXX_VERSION" = "xintel_icc7"; then + if test "x$GXX_VERSION" = "xintel_icc7"; then CXXFLAGSG="$CXXFLAGSG -Xc -ansi" CXXFLAGSO="$CXXFLAGSO -ansi_alias" - else if test "x$GXX_VERSION" = "xintel_icc8" ; then + else if test "x$GXX_VERSION" = "xintel_icc8" ; then CXXFLAGSO="$CXXFLAGSO -ansi_alias -vec_report0" fi fi - case "$target" in + case "$target" in *x86_64*) - LDFLAGS="$LDFLAGS -lpthread" - ;; + LDFLAGS="$LDFLAGS -lpthread" + ;; - *86*) - case "$GXX_VERSION" in - intel_icc5) + *86*) + case "$GXX_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CXXFLAGSO="$CXXFLAGSO -tpp6" ;; - *) + *) CXXFLAGSO="$CXXFLAGSO -mcpu=pentium4" - ;; + ;; esac - ;; - esac + ;; + esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler has a flag to support C++2011" >&5 @@ -5222,8 +5222,8 @@ main () { std::vector<int> v; - auto i = v.begin(); - *i; + auto i = v.begin(); + *i; ; return 0; @@ -5249,8 +5249,8 @@ main () { std::vector<int> v; - for (std::vector<int>::iterator i : v) - *i; + for (std::vector<int>::iterator i : v) + *i; ; return 0; @@ -5308,10 +5308,10 @@ $as_echo "no" >&6; } CXXFLAGSPIC="-KPIC" LDFLAGSPIC="-G" - CXXFLAGS="$CXXFLAGSG -library=stlport4" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -library=stlport4 works" >&5 + CXXFLAGS="$CXXFLAGSG -library=stlport4" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -library=stlport4 works" >&5 $as_echo_n "checking whether -library=stlport4 works... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5319,7 +5319,7 @@ int main () { - ; + ; ; return 0; @@ -5339,25 +5339,28 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; + ;; pgCC*) - CXXFLAGSG="$CXXFLAGSG -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 155 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284" + CXXFLAGSG="$CXXFLAGSG -DDEBUG -g --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 155 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284" CXXFLAGSO="$CXXFLAGSO -fast -O2 --display_error_number --diag_suppress 68 --diag_suppress 111 --diag_suppress 128 --diag_suppress 155 --diag_suppress 177 --diag_suppress 175 --diag_suppress 185 --diag_suppress 236 --diag_suppress 284" CXXFLAGSPIC="-Kpic" + + CXXFLAGSG="$CXXFLAGSG -DBOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE" + CXXFLAGSO="$CXXFLAGSO -DBOOST_MPL_CFG_NO_HAS_XXX_TEMPLATE" ;; kai_cc) CXXFLAGSG="$CXXFLAGSG --strict -D__KAI_STRICT --max_pending_instantiations 32 --display_error_number -g +K0 --no_implicit_typename" CXXFLAGSO="$CXXFLAGSO +K3 -O2 --abstract_float --abstract_pointer -w --display_error_number --max_pending_instantiations 32 --display_error_number" CXXFLAGSPIC="-fPIC" - ;; + ;; hp_aCC) - CXXFLAGSG="$CXXFLAGSG -g1 -AA +p" + CXXFLAGSG="$CXXFLAGSG -g1 -AA +p" CXXFLAGSO="$CXXFLAGSO -z +O2 -AA" CXXFLAGSPIC="+Z" - # for linking shared libs, -b is also necessary... + # for linking shared libs, -b is also necessary... ;; borland_bcc) @@ -5366,17 +5369,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGSPIC="" LDFLAGSPIC="" as_fn_error please remove this message from aclocal.m4 and call autoconf and configure. If you do not understand this "Attention! deal.II is not known to work with Borland C++! - If you intend to port it to Borland C++" "$LINENO" 5 + If you intend to port it to Borland C++" "$LINENO" 5 ;; pathscale_cc) - CXXFLAGSG="$CXXFLAGSG -DDEBUG -g" - CXXFLAGSO="$CXXFLAGSO -O3" + CXXFLAGSG="$CXXFLAGSG -DDEBUG -g" + CXXFLAGSO="$CXXFLAGSO -O3" ;; *) - CXXFLAGSG="$CXXFLAGSG -DDEBUG" - CXXFLAGSO="$CXXFLAGSO -O2" + CXXFLAGSG="$CXXFLAGSG -DDEBUG" + CXXFLAGSO="$CXXFLAGSO -O2" { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unknown C++ compiler - using generic options" >&5 $as_echo "Unknown C++ compiler - using generic options" >&6; } ;; @@ -5438,7 +5441,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -ggdb works" >&5 $as_echo_n "checking whether -ggdb works... " >&6; } CXXFLAGS="-ggdb $CXXFLAGSG" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5469,12 +5472,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else case "$GXX_VERSION" in borland_bcc) - CXXFLAGSG="-v -y $CXXFLAGSG" - ;; + CXXFLAGSG="-v -y $CXXFLAGSG" + ;; *) - CXXFLAGSG="-g $CXXFLAGSG" - ;; + CXXFLAGSG="-g $CXXFLAGSG" + ;; esac fi @@ -5556,21 +5559,21 @@ $as_echo "C compiler is unknown version but accepted MIPSpro compiler version" > esac else - is_intel_icc1="`($CC -V 2>&1) | grep 'Intel'`" + is_intel_icc1="`($CC -V 2>&1) | grep 'Intel'`" is_intel_icc2="`($CC -help 2>&1) | grep 'Intel'`" is_intel_ecc="`($CC -V 2>&1) | perl -pi -e 's/applications\n/\1/g;' | grep 'Intel(R) C++ Itanium(TM) Compiler'`" - is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc" + is_intel_icc="$is_intel_icc1$is_intel_icc2$is_intel_ecc" - is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" + is_pgi="`($CXX -V 2>&1) | grep 'Portland'`" if test "x$is_intel_icc" != "x" -a "x$is_pgi" = "x"; then - version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`" - version5="`echo $version_string | grep 'Version 5'`" - version6="`echo $version_string | grep 'Version 6'`" - version7="`echo $version_string | grep 'Version 7'`" - version8="`echo $version_string | grep 'Version 8'`" - version9="`echo $version_string | grep 'Version 9'`" - version10="`echo $version_string | grep 'Version 10'`" + version_string="`($CC -V 2>&1) | grep 'Version'` `($CC -help 2>&1) | grep 'Version'`" + version5="`echo $version_string | grep 'Version 5'`" + version6="`echo $version_string | grep 'Version 6'`" + version7="`echo $version_string | grep 'Version 7'`" + version8="`echo $version_string | grep 'Version 8'`" + version9="`echo $version_string | grep 'Version 9'`" + version10="`echo $version_string | grep 'Version 10'`" if test "x$version5" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is icc-5" >&5 $as_echo "C compiler is icc-5" >&6; } @@ -5609,14 +5612,14 @@ $as_echo "C compiler is Compaq cxx" >&6; } CC_VERSION=compaq_cxx else - is_sun_cc="`($CC -V 2>&1) | grep 'Sun WorkShop'`" + is_sun_cc="`($CC -V 2>&1) | grep 'Sun WorkShop'`" if test "x$is_sun_cc" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is Sun Workshop compiler" >&5 $as_echo "C compiler is Sun Workshop compiler" >&6; } CC_VERSION=sun_workshop else - is_sun_forte_cc="`($CC -V 2>&1) | grep 'Forte'`" + is_sun_forte_cc="`($CC -V 2>&1) | grep 'Forte'`" is_sun_cc="`($CC -V 2>&1) | grep 'Sun C'`" if test "x$is_sun_forte_cc$is_sun_cc" != "x" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is Sun C compiler" >&5 @@ -5624,54 +5627,54 @@ $as_echo "C compiler is Sun C compiler" >&6; } CC_VERSION=sun_cc else - is_pgcc="`($CC -V 2>&1) | grep 'Portland Group'`" - if test "x$is_pgcc" != "x" ; then - CC_VERSION_STRING=`($CC -V 2>&1) | grep "^pgcc"` + is_pgcc="`($CC -V 2>&1) | grep 'Portland Group'`" + if test "x$is_pgcc" != "x" ; then + CC_VERSION_STRING=`($CC -V 2>&1) | grep "^pgcc"` full_version=`echo "$CC_VERSION_STRING" | perl -pi -e 's/.*pgcc\s+(\S+).*/\1/g;'` - CC_VERSION=pgcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is Portland Group C $full_version" >&5 + CC_VERSION=pgcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is Portland Group C $full_version" >&5 $as_echo "C compiler is Portland Group C $full_version" >&6; } - else + else - is_aCC="`($CC -V 2>&1) | grep 'aCC'`" - if test "x$is_aCC" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is HP aCC" >&5 + is_aCC="`($CC -V 2>&1) | grep 'aCC'`" + if test "x$is_aCC" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is HP aCC" >&5 $as_echo "C compiler is HP aCC" >&6; } - CC_VERSION=hp_aCC - else + CC_VERSION=hp_aCC + else - is_bcc="`($CC -h 2>&1) | grep 'Borland'`" - if test "x$is_bcc" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is Borland C" >&5 + is_bcc="`($CC -h 2>&1) | grep 'Borland'`" + if test "x$is_bcc" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is Borland C" >&5 $as_echo "C compiler is Borland C" >&6; } - CC_VERSION=borland_bcc - else + CC_VERSION=borland_bcc + else - is_clang="`($CC --version 2>&1) | grep clang`" - if test "x$is_clang" != x ; then + is_clang="`($CC --version 2>&1) | grep clang`" + if test "x$is_clang" != x ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is clang" >&5 $as_echo "C compiler is clang" >&6; } - CC_VERSION=clang - else + CC_VERSION=clang + else - is_kai_cc="`($CC --version 2>&1) | grep 'KAI C'`" - is_kai_cc="$is_kai_cc`($CC -v 2>&1) | grep /KCC/`" - if test "x$is_kai_cc" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is KAI C" >&5 + is_kai_cc="`($CC --version 2>&1) | grep 'KAI C'`" + is_kai_cc="$is_kai_cc`($CC -v 2>&1) | grep /KCC/`" + if test "x$is_kai_cc" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C compiler is KAI C" >&5 $as_echo "C compiler is KAI C" >&6; } - CC_VERSION=kai_cc - else + CC_VERSION=kai_cc + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unrecognized compiler -- still trying" >&5 $as_echo "Unrecognized compiler -- still trying" >&6; } - CC_VERSION=unknown_cc + CC_VERSION=unknown_cc fi - fi + fi fi fi fi fi - fi + fi fi fi fi @@ -5685,12 +5688,12 @@ $as_echo "Unrecognized compiler -- still trying" >&6; } CFLAGSG="$CFLAGS -g" case "$target" in *aix* ) - CFLAGSPIC= - ;; + CFLAGSPIC= + ;; *dec-osf* ) - CFLAGSPIC="-fPIC" - ;; + CFLAGSPIC="-fPIC" + ;; *cygwin*) CFLAGSPIC= @@ -5703,8 +5706,8 @@ $as_echo "Unrecognized compiler -- still trying" >&6; } ;; *) - CFLAGSPIC="-fPIC" - ;; + CFLAGSPIC="-fPIC" + ;; esac else @@ -5714,7 +5717,7 @@ $as_echo "Unrecognized compiler -- still trying" >&6; } ibm_xlc) CFLAGSO="$CFLAGS -O2" CFLAGSPIC="-fPIC" - SHLIBLD="$CXX" + SHLIBLD="$CXX" ;; MIPSpro*) @@ -5724,43 +5727,43 @@ $as_echo "Unrecognized compiler -- still trying" >&6; } intel_icc*) CFLAGSO="$CFLAGS -O2 -unroll" - case "$CC_VERSION" in - intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + case "$CC_VERSION" in + intel_icc5 | intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CFLAGSPIC="-KPIC" - ;; + ;; - intel_icc*) - CFLAGSPIC="-fPIC" - ;; - esac + intel_icc*) + CFLAGSPIC="-fPIC" + ;; + esac - case "$CC_VERSION" in - intel_icc5) + case "$CC_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CFLAGSO="$CFLAGSO -opt_report_levelmin" ;; - *) + *) CFLAGSO="$CFLAGSO -opt-report 0 -vec-report0" - ;; + ;; esac CFLAGSO="$CFLAGSO -ansi_alias -vec_report0" - case "$target" in - *86*) - case "$CC_VERSION" in - intel_icc5) + case "$target" in + *86*) + case "$CC_VERSION" in + intel_icc5) ;; - intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) + intel_icc6 | intel_icc7 | intel_icc8 | intel_icc9) CFLAGSO="$CFLAGSO -tpp6" ;; - *) + *) CFLAGSO="$CFLAGSO -mcpu=pentium4" - ;; + ;; esac - ;; - esac + ;; + esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -wd1572 is allowed for the C compiler" >&5 @@ -5794,7 +5797,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$OLDCFLAGS" + CFLAGS="$OLDCFLAGS" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -5803,21 +5806,21 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; clang) - CFLAGS="$CFLAGS -g" - CFLAGSO="$CFLAGS -fast -O2" - CFLAGSPIC="-fPIC" - ;; + CFLAGS="$CFLAGS -g" + CFLAGSO="$CFLAGS -fast -O2" + CFLAGSPIC="-fPIC" + ;; sun_cc*) CFLAGS="$CFLAGS -g" CFLAGSO="$CFLAGS -fast -O2" - CFLAGSPIC="-fPIC" + CFLAGSPIC="-fPIC" ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unknown C compiler - using generic options" >&5 $as_echo "Unknown C compiler - using generic options" >&6; } - CFLAGSO="$CFLAGSO -O2" + CFLAGSO="$CFLAGSO -O2" ;; esac fi @@ -5840,9 +5843,9 @@ else case "$target" in *cygwin* ) enablethreads=no - ;; + ;; - * ) + * ) enablethreads=yes ;; esac @@ -5861,33 +5864,33 @@ fi case "$target" in *apple-darwin*) - ;; + ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform specific thread flags" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform specific thread flags" >&5 $as_echo_n "checking for platform specific thread flags... " >&6; } - ac_ext=cpp + 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 threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do - CXXFLAGS="$CXXFLAGSG -$i" + for i in threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do + CXXFLAGS="$CXXFLAGSG -$i" echo 'int main() { return 0; }' > conftest.$ac_ext deal_II_compiler_output=`eval $ac_compile 2>&1` if test ! "$deal_II_compiler_output"; then - rm -rf conftest* + rm -rf conftest* - thread_flag="$i" - CXXFLAGSG="$CXXFLAGSG -$i" - CXXFLAGSO="$CXXFLAGSO -$i" + thread_flag="$i" + CXXFLAGSG="$CXXFLAGSG -$i" + CXXFLAGSO="$CXXFLAGSO -$i" LDFLAGS="$LDFLAGS -$i" - break + break else @@ -5897,16 +5900,16 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu fi rm -f conftest* - done + done - if test "$thread_flag" = invalid_last_entry ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no flag found!" >&5 + if test "$thread_flag" = invalid_last_entry ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no flag found!" >&5 $as_echo "no flag found!" >&6; } - as_fn_error $? "Could not determine multithreading flag for this platform. Aborting!" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -$thread_flag" >&5 + as_fn_error $? "Could not determine multithreading flag for this platform. Aborting!" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -$thread_flag" >&5 $as_echo "-$thread_flag" >&6; } - ;; + ;; esac @@ -5931,7 +5934,7 @@ int main () { - ; + ; ; return 0; @@ -5939,15 +5942,15 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not necessary" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not necessary" >&5 $as_echo "not necessary" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: -D_REENTRANT -D_THREAD_SAFE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -D_REENTRANT -D_THREAD_SAFE" >&5 $as_echo "-D_REENTRANT -D_THREAD_SAFE" >&6; } - CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" - CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" + CXXFLAGSG="$CXXFLAGSG -D_REENTRANT -D_THREAD_SAFE" + CXXFLAGSO="$CXXFLAGSO -D_REENTRANT -D_THREAD_SAFE" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -5957,36 +5960,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGSO="$CXXFLAGSO -D_REENTRANT" else case "$GXX_VERSION" in - ibm_xlc) + ibm_xlc) CXXFLAGSG="$CXXFLAGSG -qthreaded" CXXFLAGSO="$CXXFLAGSO -qthreaded" ;; - compaq_cxx) + compaq_cxx) CXXFLAGSG="$CXXFLAGSG -pthread" CXXFLAGSO="$CXXFLAGSO -pthread" - ;; + ;; intel_icc*) - LDFLAGS="$LDFLAGS -lpthread" - ;; + LDFLAGS="$LDFLAGS -lpthread" + ;; clang*) - LDFLAGS="$LDFLAGS -lpthread" - ;; + LDFLAGS="$LDFLAGS -lpthread" + ;; cray*) - LDFLAGS="$LDFLAGS -lpthread" - ;; + LDFLAGS="$LDFLAGS -lpthread" + ;; - pgCC*) - LDFLAGS="$LDFLAGS -lpthread" - ;; + pgCC*) + LDFLAGS="$LDFLAGS -lpthread" + ;; - *) + *) as_fn_error $? "No threading compiler options for this C++ compiler specified at present" "$LINENO" 5 exit 1 - ;; + ;; esac fi @@ -6003,15 +6006,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <pthread.h> +# include <pthread.h> int main () { - pthread_t p; - pthread_create (&p, 0, 0, 0); - pthread_join (p, 0); + pthread_t p; + pthread_create (&p, 0, 0, 0); + pthread_join (p, 0); ; return 0; @@ -6019,12 +6022,12 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error $? "not found" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6040,17 +6043,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <pthread.h> +# include <pthread.h> int main () { - pthread_mutex_t pm; - pthread_mutex_init (&pm, 0); - pthread_mutex_lock (&pm); - pthread_mutex_unlock (&pm); - pthread_mutex_destroy (&pm); + pthread_mutex_t pm; + pthread_mutex_init (&pm, 0); + pthread_mutex_lock (&pm); + pthread_mutex_unlock (&pm); + pthread_mutex_destroy (&pm); ; return 0; @@ -6058,12 +6061,12 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error $? "not found" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6079,20 +6082,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <pthread.h> +# include <pthread.h> int main () { - pthread_cond_t pc; - pthread_cond_init (&pc, 0); - pthread_cond_signal (&pc); - pthread_cond_broadcast (&pc); + pthread_cond_t pc; + pthread_cond_init (&pc, 0); + pthread_cond_signal (&pc); + pthread_cond_broadcast (&pc); pthread_mutex_t pm; pthread_cond_wait (&pc, &pm); - pthread_cond_destroy (&pc); + pthread_cond_destroy (&pc); ; return 0; @@ -6100,12 +6103,12 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error $? "not found" "$LINENO" 5 + as_fn_error $? "not found" "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6121,16 +6124,16 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <pthread.h> +# include <pthread.h> int main () { - pthread_barrier_t pb; - pthread_barrier_init (&pb, 0, 1); - pthread_barrier_wait (&pb); - pthread_barrier_destroy (&pb); + pthread_barrier_t pb; + pthread_barrier_init (&pb, 0, 1); + pthread_barrier_wait (&pb); + pthread_barrier_destroy (&pb); ; return 0; @@ -6138,15 +6141,15 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } - x=0 + x=0 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. barriers will not be supported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found. barriers will not be supported" >&5 $as_echo "not found. barriers will not be supported" >&6; } - x=1 + x=1 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6179,19 +6182,19 @@ _ACEOF if test "$enablethreads" = yes ; then case "$GXX_VERSION" in gcc*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for only partly bracketed mutex initializer" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for only partly bracketed mutex initializer" >&5 $as_echo_n "checking for only partly bracketed mutex initializer... " >&6; } - ac_ext=cpp + 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="$CXXFLAGSG -Werror" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CXXFLAGS="$CXXFLAGSG -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <vector> +# include <vector> int main () @@ -6203,19 +6206,19 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CXXFLAGSG="$CXXFLAGSG -Wno-missing-braces" - CXXFLAGSO="$CXXFLAGSO -Wno-missing-braces" + CXXFLAGSG="$CXXFLAGSG -Wno-missing-braces" + CXXFLAGSO="$CXXFLAGSO -Wno-missing-braces" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; + ;; *) ;; esac @@ -6251,10 +6254,10 @@ class ExceptionBase : public std::exception { public: ExceptionBase (); ExceptionBase (const char* f, const int l, const char *func, - const char* c, const char *e); + const char* c, const char *e); virtual ~ExceptionBase () throw(); void SetFields (const char *f, const int l, const char *func, - const char *c, const char *e); + const char *c, const char *e); void PrintExcData (std::ostream &out) const; virtual void PrintInfo (std::ostream &out) const; virtual const char * what () const throw (); @@ -6266,29 +6269,29 @@ class ExceptionBase : public std::exception { template <class exc> void __IssueError_Assert (const char *file, - int line, - const char *function, - const char *cond, - const char *exc_name, - exc e){ + int line, + const char *function, + const char *cond, + const char *exc_name, + exc e){ e.SetFields (file, line, function, cond, exc_name); std::cerr << "--------------------------------------------------------" - << std::endl; + << std::endl; e.PrintExcData (std::cerr); e.PrintInfo (std::cerr); std::cerr << "--------------------------------------------------------" - << std::endl; + << std::endl; std::abort (); } template <class exc> void __IssueError_Throw (const char *file, - int line, - const char *function, - const char *cond, - const char *exc_name, - exc e) { - // Fill the fields of the exception object + int line, + const char *function, + const char *cond, + const char *exc_name, + exc e) { + // Fill the fields of the exception object e.SetFields (file, line, function, cond, exc_name); throw e; } @@ -6297,8 +6300,8 @@ void __IssueError_Throw (const char *file, { \ if (!(cond)) \ __IssueError_Throw (__FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, #cond, #exc, exc); \ + __LINE__, \ + __PRETTY_FUNCTION__, #cond, #exc, exc); \ } #define DeclException0(Exception0) \ @@ -6314,7 +6317,7 @@ int main () { - AssertThrow (false, ExcInternalError()); + AssertThrow (false, ExcInternalError()); ; return 0; @@ -6322,14 +6325,14 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG" + CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6358,10 +6361,10 @@ class ExceptionBase : public std::exception { public: ExceptionBase (); ExceptionBase (const char* f, const int l, const char *func, - const char* c, const char *e); + const char* c, const char *e); virtual ~ExceptionBase () throw(); void SetFields (const char *f, const int l, const char *func, - const char *c, const char *e); + const char *c, const char *e); void PrintExcData (std::ostream &out) const; virtual void PrintInfo (std::ostream &out) const; virtual const char * what () const throw (); @@ -6373,29 +6376,29 @@ class ExceptionBase : public std::exception { template <class exc> void __IssueError_Assert (const char *file, - int line, - const char *function, - const char *cond, - const char *exc_name, - exc e){ + int line, + const char *function, + const char *cond, + const char *exc_name, + exc e){ e.SetFields (file, line, function, cond, exc_name); std::cerr << "--------------------------------------------------------" - << std::endl; + << std::endl; e.PrintExcData (std::cerr); e.PrintInfo (std::cerr); std::cerr << "--------------------------------------------------------" - << std::endl; + << std::endl; std::abort (); } template <class exc> void __IssueError_Throw (const char *file, - int line, - const char *function, - const char *cond, - const char *exc_name, - exc e) { - // Fill the fields of the exception object + int line, + const char *function, + const char *cond, + const char *exc_name, + exc e) { + // Fill the fields of the exception object e.SetFields (file, line, function, cond, exc_name); throw e; } @@ -6404,8 +6407,8 @@ void __IssueError_Throw (const char *file, { \ if (!(cond)) \ __IssueError_Throw (__FILE__, \ - __LINE__, \ - __PRETTY_FUNCTION__, #cond, #exc, exc); \ + __LINE__, \ + __PRETTY_FUNCTION__, #cond, #exc, exc); \ } #define DeclException0(Exception0) \ @@ -6421,7 +6424,7 @@ int main () { - AssertThrow (false, ExcInternalError()); + AssertThrow (false, ExcInternalError()); ; return 0; @@ -6429,14 +6432,14 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO" + CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -6454,14 +6457,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - template < int dim > struct T { - typedef T<dim-1> SubT; - T (SubT); - }; + template < int dim > struct T { + typedef T<dim-1> SubT; + T (SubT); + }; - template <int dim> T<dim>::T (SubT) {} + template <int dim> T<dim>::T (SubT) {} - template class T<3>; + template class T<3>; int main () @@ -6500,20 +6503,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - template <int N, int M> struct T { int bar (); }; + template <int N, int M> struct T { int bar (); }; - template <int M> struct T<1,M> { + template <int M> struct T<1,M> { T (); - private: - static int i; - template <int N1, int N2> friend class T; - }; + private: + static int i; + template <int N1, int N2> friend class T; + }; - template <int N,int M> int T<N,M>::bar () { - return T<N-1,M>::i; - } + template <int N,int M> int T<N,M>::bar () { + return T<N-1,M>::i; + } - template class T<2,1>; + template class T<2,1>; int main () @@ -6552,13 +6555,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - struct X - { - template <typename T2> - X operator = (T2 &) { return X(); } - }; + struct X + { + template <typename T2> + X operator = (T2 &) { return X(); } + }; - template X X::operator=<float> (float &); + template X X::operator=<float> (float &); int main () @@ -6661,27 +6664,27 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - namespace NS { - template <typename T> class C { - C(const C<T>&); - template <typename N> friend class C; - }; - } + namespace NS { + template <typename T> class C { + C(const C<T>&); + template <typename N> friend class C; + }; + } - namespace NS2 { template <typename number> class C; } + namespace NS2 { template <typename number> class C; } - template <typename T> class X { - template <typename N> friend class NS2::C; - template <typename N> friend class NS::C; - }; + template <typename T> class X { + template <typename N> friend class NS2::C; + template <typename N> friend class NS::C; + }; - template class X<int>; + template class X<int>; - namespace NS { - template<typename T> - inline C<T>::C(const C<T>&) + namespace NS { + template<typename T> + inline C<T>::C(const C<T>&) {} - } + } int main () @@ -6722,19 +6725,19 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - namespace NS { - template <typename> struct Foo; - } + namespace NS { + template <typename> struct Foo; + } - class Bar { - template <typename Y> friend struct NS::Foo; - }; + class Bar { + template <typename Y> friend struct NS::Foo; + }; - namespace NS { - template <typename> struct Foo { Foo (); }; - } + namespace NS { + template <typename> struct Foo { Foo (); }; + } - template struct NS::Foo<int>; + template struct NS::Foo<int>; int main () @@ -6829,19 +6832,19 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - template <int dim> - struct Function - { - public: - virtual ~Function () = 0; - }; + template <int dim> + struct Function + { + public: + virtual ~Function () = 0; + }; - template <int dim> - Function<dim>::~Function () - {} + template <int dim> + Function<dim>::~Function () + {} - template class Function<1>; - template Function<1>::~Function(); + template class Function<1>; + template Function<1>::~Function(); int main () @@ -6880,17 +6883,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - template <int dim> struct TT { typedef int type; }; + template <int dim> struct TT { typedef int type; }; - template <template <int> class T> struct X { - typedef typename T<1>::type type; - void foo (type t); - }; + template <template <int> class T> struct X { + typedef typename T<1>::type type; + void foo (type t); + }; - template <template <int> class T> - void X<T>::foo (type) {} + template <template <int> class T> + void X<T>::foo (type) {} - template struct X<TT>; + template struct X<TT>; int main () @@ -6980,15 +6983,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - struct X { + struct X { X (); - private: - static int f(); + private: + static int f(); - struct Y { - int g() { return f(); }; - }; - }; + struct Y { + int g() { return f(); }; + }; + }; int main () @@ -7074,12 +7077,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - template <int dim> struct T { - static const int i; - }; + template <int dim> struct T { + static const int i; + }; - template <> const int T<1>::i; - template <> const int T<1>::i = 1; + template <> const int T<1>::i; + template <> const int T<1>::i = 1; int main () @@ -7213,24 +7216,24 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - double* copy(long double* first, long double* last, double* result) - { - int n; - for (n = last - first; n > 0; --n) { - *result = *first; - ++first; - ++result; - } - return result; - } + double* copy(long double* first, long double* last, double* result) + { + int n; + for (n = last - first; n > 0; --n) { + *result = *first; + ++first; + ++result; + } + return result; + } - void f() - { - long double *p1=0, *p2=0; - double *p3=0; - copy (p1, p2, p3); - p3 = copy (p1, p2, p3); - }; + void f() + { + long double *p1=0, *p2=0; + double *p3=0; + copy (p1, p2, p3); + p3 = copy (p1, p2, p3); + }; int main () @@ -7320,12 +7323,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS="$CXXFLAGSG" case "$GXX_VERSION" in gcc*) - CXXFLAGS="$CXXFLAGSG -Werror" - ;; + CXXFLAGS="$CXXFLAGSG -Werror" + ;; MIPSpro*) - CXXFLAGS="$CXXFLAGSG -diag_error 1174" - ;; + CXXFLAGS="$CXXFLAGSG -diag_error 1174" + ;; esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7369,7 +7372,7 @@ int main () { - ; + ; ; return 0; @@ -7377,12 +7380,12 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } cat >>confdefs.h <<_ACEOF @@ -7693,9 +7696,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu template <typename T> struct identity { typedef T type; }; template <typename C> void new_thread (void (C::*fun_ptr)(), - typename identity<C>::type &c); + typename identity<C>::type &c); template <typename C> void new_thread (void (C::*fun_ptr)() const, - const typename identity<C>::type &c); + const typename identity<C>::type &c); struct X { void f() const; }; int @@ -7801,8 +7804,8 @@ int main () { - std::complex<double> x; - x = std::complex<double>(1,0); + std::complex<double> x; + x = std::complex<double>(1,0); ; return 0; @@ -7817,7 +7820,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" + CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -7850,8 +7853,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu public: static const bool value = (sizeof(check_for_int((T*)0)) - == - sizeof(yes_type)); + == + sizeof(yes_type)); }; const bool x = IsInt<double>::value; @@ -7874,7 +7877,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CXXFLAGSG="$CXXFLAGSG -Wno-ctor-dtor-privacy" + CXXFLAGSG="$CXXFLAGSG -Wno-ctor-dtor-privacy" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -7937,13 +7940,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <iostream> +# include <iostream> int main () { - std::cout << __PRETTY_FUNCTION__ << std::endl; + std::cout << __PRETTY_FUNCTION__ << std::endl; ; return 0; @@ -7963,13 +7966,13 @@ $as_echo_n "checking for __func__... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <iostream> +# include <iostream> int main () { - std::cout << __func__ << std::endl; + std::cout << __func__ << std::endl; ; return 0; @@ -7979,13 +7982,13 @@ if ac_fn_cxx_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - x=__func__ + x=__func__ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - x="\"(not available)\"" + x="\"(not available)\"" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8058,8 +8061,8 @@ int main () { - std::istringstream i; - std::ostringstream o; + std::istringstream i; + std::ostringstream o; ; return 0; @@ -8100,7 +8103,7 @@ int main () { - return std::numeric_limits<unsigned int>::min(); + return std::numeric_limits<unsigned int>::min(); ; return 0; @@ -8218,13 +8221,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - bool f() {} + bool f() {} int main () { - if (__builtin_expect(f(),false)); + if (__builtin_expect(f(),false)); ; return 0; @@ -8280,7 +8283,7 @@ int main () { - throw 1; + throw 1; ; return 0; @@ -8342,7 +8345,7 @@ $as_echo "#define HAVE_GLIBC_STACKTRACE 1" >>confdefs.h case "$target" in *apple-darwin*) - ;; + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler accepts -rdynamic" >&5 @@ -8485,12 +8488,12 @@ int main () { _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - as_fn_error $? "impossible result -- aborting" "$LINENO" 5 + as_fn_error $? "impossible result -- aborting" "$LINENO" 5 else - result="$?" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 + result="$?" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 $as_echo "$result" >&6; } cat >>confdefs.h <<_ACEOF @@ -8527,12 +8530,12 @@ int main () { _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - as_fn_error $? "impossible result -- aborting" "$LINENO" 5 + as_fn_error $? "impossible result -- aborting" "$LINENO" 5 else - result="$?" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 + result="$?" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 $as_echo "$result" >&6; } cat >>confdefs.h <<_ACEOF @@ -8574,12 +8577,12 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define DEAL_II_ABORT_NOTHROW_EXCEPTION 1" >>confdefs.h @@ -8617,12 +8620,12 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } $as_echo "#define NO_HAVE_GETRUSAGE 1" >>confdefs.h @@ -8653,8 +8656,8 @@ int main () { - double d=0; - isnan (d); + double d=0; + isnan (d); ; return 0; @@ -8662,10 +8665,10 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - deal_II_isnan_flag="-DHAVE_ISNAN" - CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" + deal_II_isnan_flag="-DHAVE_ISNAN" + CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8681,8 +8684,8 @@ int main () { - double d=0; - _isnan (d); + double d=0; + _isnan (d); ; return 0; @@ -8690,10 +8693,10 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" - CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" + deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" + CXXFLAGSG="$deal_II_isnan_flag $CXXFLAGSG" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8713,8 +8716,8 @@ int main () { - double d=0; - isnan (d); + double d=0; + isnan (d); ; return 0; @@ -8722,8 +8725,8 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - deal_II_isnan_flag="-DHAVE_ISNAN $testflag" - break; + deal_II_isnan_flag="-DHAVE_ISNAN $testflag" + break; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8737,8 +8740,8 @@ int main () { - double d=0; - _isnan (d); + double d=0; + _isnan (d); ; return 0; @@ -8746,8 +8749,8 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" - break; + deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" + break; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8783,8 +8786,8 @@ int main () { - double d=0; - isnan (d); + double d=0; + isnan (d); ; return 0; @@ -8792,10 +8795,10 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - deal_II_isnan_flag="-DHAVE_ISNAN" - CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" + deal_II_isnan_flag="-DHAVE_ISNAN" + CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8811,8 +8814,8 @@ int main () { - double d=0; - _isnan (d); + double d=0; + _isnan (d); ; return 0; @@ -8820,10 +8823,10 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" - CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" + deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN" + CXXFLAGSO="$deal_II_isnan_flag $CXXFLAGSO" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8843,8 +8846,8 @@ int main () { - double d=0; - isnan (d); + double d=0; + isnan (d); ; return 0; @@ -8852,8 +8855,8 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - deal_II_isnan_flag="-DHAVE_ISNAN $testflag" - break; + deal_II_isnan_flag="-DHAVE_ISNAN $testflag" + break; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8867,8 +8870,8 @@ int main () { - double d=0; - _isnan (d); + double d=0; + _isnan (d); ; return 0; @@ -8876,8 +8879,8 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" - break; + deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" + break; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -8914,8 +8917,8 @@ int main () { - double d=0; - std::isfinite (d); + double d=0; + std::isfinite (d); ; return 0; @@ -8923,7 +8926,7 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define DEAL_II_HAVE_ISFINITE 1" >>confdefs.h @@ -8965,7 +8968,7 @@ int i=rand_r(&i); _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define HAVE_RAND_R 1" >>confdefs.h @@ -8973,7 +8976,7 @@ $as_echo "#define HAVE_RAND_R 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -9668,7 +9671,7 @@ 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 + -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;'` @@ -9693,24 +9696,24 @@ $as_echo "F77 compiler is AIX Fortran77" >&6; } -n "`echo $F77_VERSION_STRING | grep \"Sun WorkShop\"`" \ -o \ -n "`echo $F77_VERSION_STRING | grep \"Forte Developer\"`" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: F77 compiler is Sun WorkShop f77" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: F77 compiler is Sun WorkShop f77" >&5 $as_echo "F77 compiler is Sun WorkShop f77" >&6; } - F77_VERSION="SunF77" + 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:${as_lineno-$LINENO}: result: F77 compiler is MIPSpro f77" >&5 + if test -n "`echo $F77_VERSION_STRING | grep MIPSpro`" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: F77 compiler is MIPSpro f77" >&5 $as_echo "F77 compiler is MIPSpro f77" >&6; } - F77_VERSION="MIPSproF77" + 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:${as_lineno-$LINENO}: result: F77 compiler is Intel Fortran" >&5 + if test "x$is_intel_ifc" != "x" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: F77 compiler is Intel Fortran" >&5 $as_echo "F77 compiler is Intel Fortran" >&6; } F77_VERSION=INTEL_F77 @@ -9718,7 +9721,7 @@ $as_echo "F77 compiler is Intel Fortran" >&6; } F77_VERSION="UnknownF77" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: F77 compiler is unknown. no flags set!" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: F77 compiler is unknown. no flags set!" >&5 $as_echo "F77 compiler is unknown. no flags set!" >&6; } fi fi @@ -9739,18 +9742,18 @@ $as_echo "F77 compiler is unknown. no flags set!" >&6; } ;; *apple-darwin*) - if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then - F77FLAGSG="$F77FLAGSG -m64" + if test "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ; then + F77FLAGSG="$F77FLAGSG -m64" F77FLAGSO="$F77FLAGSO -m64" fi - ;; + ;; * ) - F77FLAGSPIC="-fPIC" + F77FLAGSPIC="-fPIC" ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for e_wsfe in -lg2c" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for e_wsfe in -lg2c" >&5 $as_echo_n "checking for e_wsfe in -lg2c... " >&6; } if ${ac_cv_lib_g2c_e_wsfe+:} false; then : $as_echo_n "(cached) " >&6 @@ -9791,7 +9794,7 @@ if test "x$ac_cv_lib_g2c_e_wsfe" = xyes; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _gfortran_allocate in -lgfortran" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _gfortran_allocate in -lgfortran" >&5 $as_echo_n "checking for _gfortran_allocate in -lgfortran... " >&6; } if ${ac_cv_lib_gfortran__gfortran_allocate+:} false; then : $as_echo_n "(cached) " >&6 @@ -9872,13 +9875,13 @@ if test "x$ac_cv_lib_gfortran__gfortran_st_write_done" = xyes; then : fi - if test "x$found" = "x1" ; then + if test "x$found" = "x1" ; then F77LIBS="$F77LIBS -lgfortran" fi - ;; + ;; AIXF77) - F77FLAGSG="$FFLAGS -g -qextname" + F77FLAGSG="$FFLAGS -g -qextname" F77FLAGSO="$FFLAGS -O3 -w -qextname" F77LIBS="$F77LIBS -lxlf90" @@ -9886,38 +9889,38 @@ fi ;; SunF77) - F77FLAGSG="$FFLAGS -silent -g" - F77FLAGSO="$FFLAGS -silent -O3 -w" - F77LIBS="$F77LIBS -lF77 -lsunmath -lM77" + 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" + F77FLAGSG="$FFLAGS -ansi -g" + F77FLAGSO="$FFLAGS -O3 -woffall" + F77LIBS="$F77LIBS -lftn" - F77FLAGSPIC="shared -KPIC" - ;; + F77FLAGSPIC="shared -KPIC" + ;; INTEL_F77*) F77FLAGSG="$FFLAGS" F77FLAGSO="$FFLAGS -O3" - ;; + ;; UnknownF77) - F77="UnknownF77" + F77="UnknownF77" F77FLAGSG="$FFLAGS -g" F77FLAGSO="$FFLAGS -O2" F77LIBS="$F77LIBS" F77FLAGSPIC="unknown!" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unknown FORTRAN compiler has been disabled!" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unknown FORTRAN compiler has been disabled!" >&5 $as_echo "Unknown FORTRAN compiler has been disabled!" >&6; } ;; - *) - as_fn_error $? "No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" "$LINENO" 5 + *) + as_fn_error $? "No compiler options for F77 compiler \"$F77_VERSION\" specified: modification of aclocal.m4 necessary" "$LINENO" 5 ;; esac @@ -10425,11 +10428,11 @@ cat >>confdefs.h <<_ACEOF #define DEAL_II_COMPAT_MAPPING $compat_value _ACEOF - ;; + ;; *) - as_fn_error $? "Backward compatibility feature \"$i\" unknown" "$LINENO" 5 - ;; + as_fn_error $? "Backward compatibility feature \"$i\" unknown" "$LINENO" 5 + ;; esac done @@ -10531,7 +10534,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" + CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-Wsynth\s*//g;'`" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -10568,7 +10571,7 @@ main () std::complex<float> float_val (1., 2.); boost::bind(&bug_function<std::complex<float> >, - float_val)(); + float_val)(); ; return 0; @@ -10613,8 +10616,8 @@ namespace types using namespace boost; typedef adjacency_list<vecS, vecS, undirectedS, - property<vertex_color_t, default_color_type, - property<vertex_degree_t,int> > > Graph; + property<vertex_color_t, default_color_type, + property<vertex_degree_t,int> > > Graph; } void create_graph (types::Graph) @@ -10661,31 +10664,31 @@ if test "${with_petsc+set}" = set; then : $as_echo "explicitly disabled" >&6; } USE_CONTRIB_PETSC=no else - USE_CONTRIB_PETSC=yes + USE_CONTRIB_PETSC=yes DEAL_II_PETSC_DIR="$withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_PETSC_DIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_PETSC_DIR" >&5 $as_echo "$DEAL_II_PETSC_DIR" >&6; } if test ! -d $DEAL_II_PETSC_DIR/include \ ; then as_fn_error $? "Path to PETSc specified with --with-petsc does not point to a complete PETSc installation" "$LINENO" 5 - fi + fi fi else if test "x$PETSC_DIR" != "x" ; then - USE_CONTRIB_PETSC=yes + USE_CONTRIB_PETSC=yes DEAL_II_PETSC_DIR="$PETSC_DIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_PETSC_DIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_PETSC_DIR" >&5 $as_echo "$DEAL_II_PETSC_DIR" >&6; } if test ! -d $DEAL_II_PETSC_DIR/include \ ; then as_fn_error $? "The path to PETSc specified in the PETSC_DIR environment variable does not point to a complete PETSc installation" "$LINENO" 5 - fi + fi else - USE_CONTRIB_PETSC=no + USE_CONTRIB_PETSC=no DEAL_II_PETSC_DIR="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } @@ -10773,7 +10776,7 @@ fi fi ;; *) as_fn_error $? "Unknown PETSc version ${DEAL_II_PETSC_VERSION_MAJOR}.${DEAL_II_PETSC_VERSION_MINOR}.${DEAL_II_PETSC_VERSION_SUBMINOR}" "$LINENO" 5 - ;; + ;; esac fi @@ -10985,12 +10988,12 @@ $as_echo "$DEAL_II_SLEPC_DIR" >&6; } -o ! -d $DEAL_II_SLEPC_DIR/include \ ; then as_fn_error $? "Path to SLEPc specified with --with-slepc does not point to a complete SLEPc installation" "$LINENO" 5 - fi + fi - if test ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH \ + if test ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH \ -o ! -d $DEAL_II_SLEPC_DIR/$DEAL_II_PETSC_ARCH/lib \ ; then - as_fn_error $? "SLEPc has not been compiled for the PETSc architecture" "$LINENO" 5 + as_fn_error $? "SLEPc has not been compiled for the PETSc architecture" "$LINENO" 5 fi fi @@ -11005,7 +11008,7 @@ $as_echo "$DEAL_II_SLEPC_DIR" >&6; } -o ! -d $DEAL_II_SLEPC_DIR/include \ ; then as_fn_error $? "The path to SLEPc specified in the SLEPC_DIR environment variable does not point to a complete SLEPc installation" "$LINENO" 5 - fi + fi else USE_CONTRIB_SLEPC=no DEAL_II_SLEPC_DIR="" @@ -11054,7 +11057,7 @@ $as_echo "$SLEPC_VERSION" >&6; } if test "${PETSC_VERSION}" != "${SLEPC_VERSION}" \ -o "${PETSC_RELEASE}" != "${SLEPC_RELEASE}" \ ; then - as_fn_error $? "If SLEPc is used, you must use the same version number as your PETSc Installation" "$LINENO" 5 + as_fn_error $? "If SLEPc is used, you must use the same version number as your PETSc Installation" "$LINENO" 5 fi @@ -11082,42 +11085,42 @@ if test "${with_trilinos+set}" = set; then : $as_echo "explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else - USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_DIR="$withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5 + USE_CONTRIB_TRILINOS=yes + DEAL_II_TRILINOS_DIR="$withval" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5 $as_echo "$DEAL_II_TRILINOS_DIR" >&6; } if test ! -d $DEAL_II_TRILINOS_DIR/include \ -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then as_fn_error $? "Path to Trilinos specified with --with-trilinos does not point to a complete Trilinos installation" "$LINENO" 5 - fi + fi - DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include" - DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib" + DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include" + DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib" fi else if test "x$TRILINOS_DIR" != "x" ; then - if test "x$withval" = "xno" ; then + if test "x$withval" = "xno" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5 $as_echo "explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else - USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_DIR="$TRILINOS_DIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5 + USE_CONTRIB_TRILINOS=yes + DEAL_II_TRILINOS_DIR="$TRILINOS_DIR" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5 $as_echo "$DEAL_II_TRILINOS_DIR" >&6; } - if test ! -d $DEAL_II_TRILINOS_DIR/include \ - -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then - as_fn_error $? "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 - fi - DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include" - DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib" - fi + if test ! -d $DEAL_II_TRILINOS_DIR/include \ + -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then + as_fn_error $? "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 + fi + DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include" + DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib" + fi else - USE_CONTRIB_TRILINOS=no + USE_CONTRIB_TRILINOS=no DEAL_II_TRILINOS_DIR="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } @@ -11138,30 +11141,30 @@ if test "${with_trilinos_include+set}" = set; then : $as_echo "explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else - USE_CONTRIB_TRILINOS=yes + USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_INCDIR="$withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_INCDIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_INCDIR" >&5 $as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_INCDIR ; then as_fn_error $? "Path to Trilinos specified with --with-trilinos-include does not point to a complete Trilinos installation" "$LINENO" 5 - fi + fi fi else if test "x$TRILINOS_INCDIR" != "x" ; then - USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_INCDIR="$TRILINOS_INCDIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_INCDIR" >&5 + USE_CONTRIB_TRILINOS=yes + DEAL_II_TRILINOS_INCDIR="$TRILINOS_INCDIR" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_INCDIR" >&5 $as_echo "$DEAL_II_TRILINOS_INCDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_INCDIR ; then as_fn_error $? "The path to Trilinos includes specified in the TRILINOS_INCDIR environment variable does not point to a valid directory" "$LINENO" 5 - fi + fi else - if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then - USE_CONTRIB_TRILINOS=no + if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then + USE_CONTRIB_TRILINOS=no DEAL_II_TRILINOS_INCDIR="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } @@ -11186,30 +11189,30 @@ if test "${with_trilinos_libs+set}" = set; then : $as_echo "explicitly disabled" >&6; } USE_CONTRIB_TRILINOS=no else - USE_CONTRIB_TRILINOS=yes + USE_CONTRIB_TRILINOS=yes DEAL_II_TRILINOS_LIBDIR="$withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_LIBDIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_LIBDIR" >&5 $as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then as_fn_error $? "Path to Trilinos libraries with --with-trilinos-libs does not point to a valid directory" "$LINENO" 5 - fi + fi fi else if test "x$TRILINOS_LIBDIR" != "x" ; then - USE_CONTRIB_TRILINOS=yes - DEAL_II_TRILINOS_LIBDIR="$TRILINOS_LIBDIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_LIBDIR" >&5 + USE_CONTRIB_TRILINOS=yes + DEAL_II_TRILINOS_LIBDIR="$TRILINOS_LIBDIR" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_LIBDIR" >&5 $as_echo "$DEAL_II_TRILINOS_LIBDIR" >&6; } if test ! -d $DEAL_II_TRILINOS_LIBDIR ; then as_fn_error $? "The path to Trilinos specified in the TRILINOS_LIBDIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5 - fi + fi else - if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then - USE_CONTRIB_TRILINOS=no + if test "x${USE_CONTRIB_TRILINOS}" != "xyes" ; then + USE_CONTRIB_TRILINOS=no DEAL_II_TRILINOS_LIBDIR="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } @@ -11238,11 +11241,11 @@ $as_echo_n "checking for Trilinos version... " >&6; } DEAL_II_TRILINOS_VERSION_MINOR=`cat $DEAL_II_TRILINOS_INCDIR/Trilinos_version.h \ | grep "#define TRILINOS_MAJOR_MINOR_VERSION" \ | perl -pi -e 's/.*VERSION\s+\d?\d(\d\d)\d\d/\1/g;' \ - | perl -pi -e 's/0(\d)/\1/g;'` + | perl -pi -e 's/0(\d)/\1/g;'` DEAL_II_TRILINOS_VERSION_SUBMINOR=`cat $DEAL_II_TRILINOS_INCDIR/Trilinos_version.h \ | grep "#define TRILINOS_MAJOR_MINOR_VERSION" \ | perl -pi -e 's/.*VERSION\s+\d?\d\d\d(\d\d)/\1/g;' \ - | perl -pi -e 's/0(\d)/\1/g;'` + | perl -pi -e 's/0(\d)/\1/g;'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_II_TRILINOS_VERSION_SUBMINOR" >&5 $as_echo "$DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_II_TRILINOS_VERSION_SUBMINOR" >&6; } @@ -11301,15 +11304,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include <Epetra_config.h> + #include <Epetra_config.h> int main () { - #ifndef HAVE_MPI - compile error; - #endif + #ifndef HAVE_MPI + compile error; + #endif ; return 0; @@ -11338,8 +11341,8 @@ main () { #ifdef HAVE_MPI - compile error; - #endif + compile error; + #endif ; return 0; @@ -11352,8 +11355,8 @@ $as_echo "yes" >&6; } else - as_fn_error $? "Trilinos was built for MPI, but deal.II is not!" "$LINENO" 5 - exit 1; + as_fn_error $? "Trilinos was built for MPI, but deal.II is not!" "$LINENO" 5 + exit 1; fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -11823,7 +11826,7 @@ $as_echo "yes" >&6; } if test "x$enableshared" != "xyes" ; then as_fn_error $? "When using p4est with shared libraries, you need to build - deal.II with shared libraries as well." "$LINENO" 5 + deal.II with shared libraries as well." "$LINENO" 5 fi @@ -12088,7 +12091,7 @@ fi NEEDS_F77LIBS="yes" - USE_CONTRIB_BLAS='yes' + USE_CONTRIB_BLAS='yes' fi fi fi @@ -12514,9 +12517,9 @@ if test "${with_netcdf+set}" = set; then : else if test "x$NETCDF_DIR" != "x" ; then - DEAL_II_NETCDF_DIR="$NETCDF_DIR" + DEAL_II_NETCDF_DIR="$NETCDF_DIR" else - DEAL_II_NETCDF_DIR="" + DEAL_II_NETCDF_DIR="" fi fi @@ -12526,7 +12529,7 @@ fi # Check whether --with-netcdf-include was given. if test "${with_netcdf_include+set}" = set; then : withval=$with_netcdf_include; - NETCDF_INCLUDE_DIR="$withval" + NETCDF_INCLUDE_DIR="$withval" fi @@ -12535,7 +12538,7 @@ fi # Check whether --with-netcdf-libs was given. if test "${with_netcdf_libs+set}" = set; then : withval=$with_netcdf_libs; - NETCDF_LIBDIR="$withval" + NETCDF_LIBDIR="$withval" fi @@ -12554,7 +12557,7 @@ fi else LDFLAGS="-L$DEAL_II_NETCDF_DIR/lib $LDFLAGS" if test "$LD_PATH_OPTION" != "no" ; then - LDFLAGS="$LD_PATH_OPTION$DEAL_II_NETCDF_DIR/lib $LDFLAGS" + LDFLAGS="$LD_PATH_OPTION$DEAL_II_NETCDF_DIR/lib $LDFLAGS" fi fi else @@ -12661,31 +12664,31 @@ fi # Check whether --with-metis was given. if test "${with_metis+set}" = set; then : withval=$with_metis; - USE_CONTRIB_METIS=yes + USE_CONTRIB_METIS=yes DEAL_II_METIS_DIR="$withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_DIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_DIR" >&5 $as_echo "$DEAL_II_METIS_DIR" >&6; } if test ! -d $DEAL_II_METIS_DIR/Lib ; then as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 - fi + fi - DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" + DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" else if test "x$METIS_DIR" != "x" ; then - USE_CONTRIB_METIS=yes + USE_CONTRIB_METIS=yes DEAL_II_METIS_DIR="$METIS_DIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_DIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_DIR" >&5 $as_echo "$DEAL_II_METIS_DIR" >&6; } if test ! -d $DEAL_II_METIS_DIR/Lib ; then as_fn_error $? "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5 - fi - DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" + fi + DEAL_II_METIS_LIBDIR="$DEAL_II_METIS_DIR" else - USE_CONTRIB_METIS=no + USE_CONTRIB_METIS=no DEAL_II_METIS_DIR="" fi @@ -12696,29 +12699,29 @@ fi # Check whether --with-metis-libs was given. if test "${with_metis_libs+set}" = set; then : withval=$with_metis_libs; - USE_CONTRIB_METIS=yes + USE_CONTRIB_METIS=yes DEAL_II_METIS_LIBDIR="$withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_LIBDIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_LIBDIR" >&5 $as_echo "$DEAL_II_METIS_LIBDIR" >&6; } if test ! -d $DEAL_II_METIS_LIBDIR ; then as_fn_error $? "Path to Metis specified with --with-metis does not point to a complete Metis installation" "$LINENO" 5 - fi + fi else if test "x$METIS_LIBDIR" != "x" ; then - USE_CONTRIB_METIS=yes + USE_CONTRIB_METIS=yes DEAL_II_METIS_LIBDIR="$METIS_LIBDIR" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_LIBDIR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_METIS_LIBDIR" >&5 $as_echo "$DEAL_II_METIS_LIBDIR" >&6; } if test ! -d $DEAL_II_METIS_LIBDIR ; then as_fn_error $? "The path to Metis specified in the METIS_DIR environment variable does not point to a complete Metis installation" "$LINENO" 5 - fi + fi else - if test "x$USE_CONTRIB_METIS" != "xyes" ; then - USE_CONTRIB_METIS=no + if test "x$USE_CONTRIB_METIS" != "xyes" ; then + USE_CONTRIB_METIS=no DEAL_II_METIS_LIBDIR="" fi fi @@ -12764,8 +12767,8 @@ $as_echo "trying version at $withval" >&6; } $as_echo "#define HAVE_LIBUMFPACK 1" >>confdefs.h - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5 $as_echo "explicitly disabled" >&6; } fi fi @@ -12780,7 +12783,7 @@ fi # Check whether --with-umfpack-include was given. if test "${with_umfpack_include+set}" = set; then : withval=$with_umfpack_include; - UMFPACK_INCDIR="$withval" + UMFPACK_INCDIR="$withval" acx_umfpack=yes fi @@ -12790,7 +12793,7 @@ fi # Check whether --with-umfpack-libs was given. if test "${with_umfpack_libs+set}" = set; then : withval=$with_umfpack_libs; - UMFPACK_LIBDIR="$withval" + UMFPACK_LIBDIR="$withval" acx_umfpack=yes fi @@ -13455,7 +13458,7 @@ $as_echo "#define HAVE_LIBLAPACK 1" >>confdefs.h DEAL_II_USE_LAPACK="yes" - USE_CONTRIB_LAPACK='yes' + USE_CONTRIB_LAPACK='yes' else as_fn_error $? "LAPACK library $lapack not found" "$LINENO" 5 @@ -13589,36 +13592,36 @@ $as_echo_n "checking for CPU to optimize for... " >&6; } PowerPC64) { $as_echo "$as_me:${as_lineno-$LINENO}: result: PowerPC64" >&5 $as_echo "PowerPC64" >&6; } - case "$GXX_VERSION" in - gcc*) - CXXFLAGSG="$CXXFLAGSG -maix64" - CXXFLAGSO="$CXXFLAGSO -maix64 -mpowerpc64 -mcpu=powerpc64 -mtune=powerpc64" + case "$GXX_VERSION" in + gcc*) + CXXFLAGSG="$CXXFLAGSG -maix64" + CXXFLAGSO="$CXXFLAGSO -maix64 -mpowerpc64 -mcpu=powerpc64 -mtune=powerpc64" - CXXFLAGSG="$CXXFLAGSG -mminimal-toc" - CXXFLAGSO="$CXXFLAGSO -mminimal-toc" + CXXFLAGSG="$CXXFLAGSG -mminimal-toc" + CXXFLAGSO="$CXXFLAGSO -mminimal-toc" - F77FLAGSG="$F77FLAGSG -q64" - F77FLAGSO="$F77FLAGSO -q64" + F77FLAGSG="$F77FLAGSG -q64" + F77FLAGSO="$F77FLAGSO -q64" - AR="$AR -X 64" - LDFLAGS="$LDFLAGS -maix64" + AR="$AR -X 64" + LDFLAGS="$LDFLAGS -maix64" LIBS="$LIBS -lpthread" ;; esac - ;; + ;; athlon* | pentium* | i386 | i486 | i586 | i686 | k6* | winchip* | opteron) { $as_echo "$as_me:${as_lineno-$LINENO}: result: x86 derivate ($withcpu)" >&5 $as_echo "x86 derivate ($withcpu)" >&6; } - case "$GXX_VERSION" in - gcc*) - CXXFLAGSG="$CXXFLAGSG -march=$withcpu" - CXXFLAGSO="$CXXFLAGSO -march=$withcpu" + case "$GXX_VERSION" in + gcc*) + CXXFLAGSG="$CXXFLAGSG -march=$withcpu" + CXXFLAGSO="$CXXFLAGSO -march=$withcpu" - F77FLAGSG="$F77FLAGSG -march=$withcpu" - F77FLAGSO="$F77FLAGSO -march=$withcpu" + F77FLAGSG="$F77FLAGSG -march=$withcpu" + F77FLAGSO="$F77FLAGSO -march=$withcpu" ;; esac ;; @@ -13626,13 +13629,13 @@ $as_echo "x86 derivate ($withcpu)" >&6; } native) { $as_echo "$as_me:${as_lineno-$LINENO}: result: native processor variant" >&5 $as_echo "native processor variant" >&6; } - case "$GXX_VERSION" in - gcc*) - CXXFLAGSG="$CXXFLAGSG -march=native" - CXXFLAGSO="$CXXFLAGSO -march=native" + case "$GXX_VERSION" in + gcc*) + CXXFLAGSG="$CXXFLAGSG -march=native" + CXXFLAGSO="$CXXFLAGSO -march=native" - F77FLAGSG="$F77FLAGSG -march=native" - F77FLAGSO="$F77FLAGSO -march=native" + F77FLAGSG="$F77FLAGSG -march=native" + F77FLAGSO="$F77FLAGSO -march=native" ;; intel_icc*) @@ -13645,7 +13648,7 @@ $as_echo "native processor variant" >&6; } *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: none given or not recognized" >&5 $as_echo "none given or not recognized" >&6; } - ;; + ;; esac @@ -13734,30 +13737,30 @@ else #include <emmintrin.h> #include <mm_malloc.h> - int main() - { + int main() + { __m128d a, b; - const unsigned int vector_bytes = sizeof(__m128d); - const int n_vectors = vector_bytes/sizeof(double); - __m128d * data = - reinterpret_cast<__m128d*>(_mm_malloc (2*vector_bytes, vector_bytes)); - double * ptr = reinterpret_cast<double*>(&a); - ptr[0] = (volatile double)(1.0); - for (int i=1; i<n_vectors; ++i) - ptr[i] = 0.0; - b = _mm_set1_pd ((volatile double)(2.25)); - data[0] = _mm_add_pd (a, b); - data[1] = _mm_mul_pd (b, data[0]); - ptr = reinterpret_cast<double*>(&data[1]); - unsigned int return_value = 0; - if (ptr[0] != 7.3125) - return_value = 1; - for (int i=1; i<n_vectors; ++i) - if (ptr[i] != 5.0625) - return_value = 1; - _mm_free (data); - return return_value; - } + const unsigned int vector_bytes = sizeof(__m128d); + const int n_vectors = vector_bytes/sizeof(double); + __m128d * data = + reinterpret_cast<__m128d*>(_mm_malloc (2*vector_bytes, vector_bytes)); + double * ptr = reinterpret_cast<double*>(&a); + ptr[0] = (volatile double)(1.0); + for (int i=1; i<n_vectors; ++i) + ptr[i] = 0.0; + b = _mm_set1_pd ((volatile double)(2.25)); + data[0] = _mm_add_pd (a, b); + data[1] = _mm_mul_pd (b, data[0]); + ptr = reinterpret_cast<double*>(&data[1]); + unsigned int return_value = 0; + if (ptr[0] != 7.3125) + return_value = 1; + for (int i=1; i<n_vectors; ++i) + if (ptr[i] != 5.0625) + return_value = 1; + _mm_free (data); + return return_value; + } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : @@ -13777,34 +13780,34 @@ else #include <immintrin.h> #include <mm_malloc.h> - int main() - { + int main() + { __m256d a, b; - const unsigned int vector_bytes = sizeof(__m256d); - const int n_vectors = vector_bytes/sizeof(double); - __m256d * data = - reinterpret_cast<__m256d*>(_mm_malloc (2*vector_bytes, vector_bytes)); - double * ptr = reinterpret_cast<double*>(&a); - ptr[0] = (volatile double)(1.0); - for (int i=1; i<n_vectors; ++i) - ptr[i] = 0.0; - b = _mm256_set1_pd ((volatile double)(2.25)); - data[0] = _mm256_add_pd (a, b); - data[1] = _mm256_mul_pd (b, data[0]); - ptr = reinterpret_cast<double*>(&data[1]); - unsigned int return_value = 0; - if (ptr[0] != 7.3125) - return_value = 1; - for (int i=1; i<n_vectors; ++i) - if (ptr[i] != 5.0625) - return_value = 1; - _mm_free (data); - } + const unsigned int vector_bytes = sizeof(__m256d); + const int n_vectors = vector_bytes/sizeof(double); + __m256d * data = + reinterpret_cast<__m256d*>(_mm_malloc (2*vector_bytes, vector_bytes)); + double * ptr = reinterpret_cast<double*>(&a); + ptr[0] = (volatile double)(1.0); + for (int i=1; i<n_vectors; ++i) + ptr[i] = 0.0; + b = _mm256_set1_pd ((volatile double)(2.25)); + data[0] = _mm256_add_pd (a, b); + data[1] = _mm256_mul_pd (b, data[0]); + ptr = reinterpret_cast<double*>(&data[1]); + unsigned int return_value = 0; + if (ptr[0] != 7.3125) + return_value = 1; + for (int i=1; i<n_vectors; ++i) + if (ptr[i] != 5.0625) + return_value = 1; + _mm_free (data); + } _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define DEAL_II_COMPILER_VECTORIZATION_LEVEL 2" >>confdefs.h @@ -13860,12 +13863,12 @@ main () __m128d a, b; a = _mm_set_sd (1.0); - b = _mm_set1_pd (2.1); - __m128d c = a + b; - __m128d d = b - c; - __m128d e = c * a + d; - __m128d f = e/a; - (void)f; + b = _mm_set1_pd (2.1); + __m128d c = a + b; + __m128d d = b - c; + __m128d e = c * a + d; + __m128d f = e/a; + (void)f; ; return 0; @@ -13873,7 +13876,7 @@ main () _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define DEAL_II_COMPILER_USE_VECTOR_ARITHMETICS 1" >>confdefs.h @@ -13969,14 +13972,14 @@ $as_echo_n "checking doxygen version... " >&6; } case "$DOXYGEN_VERSION_STRING" in *1.3.* | *1.4.*) DOXYGEN_OPTIONS="options.136" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre 1.5" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre 1.5" >&5 $as_echo "pre 1.5" >&6; } - ;; + ;; *) - DOXYGEN_OPTIONS="options.dox" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1.5.x or later" >&5 + DOXYGEN_OPTIONS="options.dox" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1.5.x or later" >&5 $as_echo "1.5.x or later" >&6; } - ;; + ;; esac fi -- 2.39.5