From f8cba720ba0e86d9244920f884bec8274b6fde7f Mon Sep 17 00:00:00 2001 From: bangerth 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 v; - auto i = v.begin(); - *i; + auto i = v.begin(); + *i; ; return 0; @@ -4485,8 +4485,8 @@ main () { std::vector v; - for (std::vector::iterator i : v) - *i; + for (std::vector::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 -# include +# include +# include 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 v; - auto i = v.begin(); - *i; + auto i = v.begin(); + *i; ; return 0; @@ -5249,8 +5249,8 @@ main () { std::vector v; - for (std::vector::iterator i : v) - *i; + for (std::vector::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 +# include 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 +# include 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 +# include 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 +# include 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 +# include 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 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 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 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 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 SubT; - T (SubT); - }; + template < int dim > struct T { + typedef T SubT; + T (SubT); + }; - template T::T (SubT) {} + template T::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 struct T { int bar (); }; + template struct T { int bar (); }; - template struct T<1,M> { + template struct T<1,M> { T (); - private: - static int i; - template friend class T; - }; + private: + static int i; + template friend class T; + }; - template int T::bar () { - return T::i; - } + template int T::bar () { + return T::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 - X operator = (T2 &) { return X(); } - }; + struct X + { + template + X operator = (T2 &) { return X(); } + }; - template X X::operator= (float &); + template X X::operator= (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 class C { - C(const C&); - template friend class C; - }; - } + namespace NS { + template class C { + C(const C&); + template friend class C; + }; + } - namespace NS2 { template class C; } + namespace NS2 { template class C; } - template class X { - template friend class NS2::C; - template friend class NS::C; - }; + template class X { + template friend class NS2::C; + template friend class NS::C; + }; - template class X; + template class X; - namespace NS { - template - inline C::C(const C&) + namespace NS { + template + inline C::C(const C&) {} - } + } 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 struct Foo; - } + namespace NS { + template struct Foo; + } - class Bar { - template friend struct NS::Foo; - }; + class Bar { + template friend struct NS::Foo; + }; - namespace NS { - template struct Foo { Foo (); }; - } + namespace NS { + template struct Foo { Foo (); }; + } - template struct NS::Foo; + template struct NS::Foo; 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 - struct Function - { - public: - virtual ~Function () = 0; - }; + template + struct Function + { + public: + virtual ~Function () = 0; + }; - template - Function::~Function () - {} + template + Function::~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 struct TT { typedef int type; }; + template struct TT { typedef int type; }; - template