From f11563cc908fa02a369e481f3322aafb94e6281e Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 8 Nov 2011 13:29:47 +0000 Subject: [PATCH] Work around a problem with intel icc 12.1... git-svn-id: https://svn.dealii.org/trunk@24737 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 13 ++++++++++++- deal.II/configure | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 6f5ec23313..f5a45c65b0 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1198,7 +1198,9 @@ AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl CXXFLAGSO="$CXXFLAGSO $1" AC_DEFINE(DEAL_II_CAN_USE_CXX1X, 1, - [Defined if the compiler we use supports the upcoming C++1x standard.]) + [Defined if the compiler we use supports the C++2011 standard + well enough to allow using the standard library classes instead + of the corresponding BOOST classes.]) dnl Also test for a couple C++1x things that we don't use in the library @@ -1240,6 +1242,15 @@ AC_DEFUN(DEAL_II_CHECK_CXX1X_COMPONENTS, dnl dnl and that we could use to test these features. else AC_MSG_RESULT(no) + + dnl Intel icc 12.1 has this crazy behavior where it needs -std=c++0x + dnl to compile BOOST, but it fails every single one of the header + dnl file tests above. So we end up here. Work around this by using + dnl the flag even though we can't use a single piece of functionality. + if test "x$GXX_VERSION" = "xintel_icc12" ; then + CXXFLAGSG="$CXXFLAGSG $1" + CXXFLAGSO="$CXXFLAGSO $1" + fi fi ]) diff --git a/deal.II/configure b/deal.II/configure index 46f4266466..ebb640e383 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -4470,6 +4470,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + + if test "x$GXX_VERSION" = "xintel_icc12" ; then + CXXFLAGSG="$CXXFLAGSG "-std=c++0x"" + CXXFLAGSO="$CXXFLAGSO "-std=c++0x"" + fi fi fi @@ -5198,6 +5203,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + + if test "x$GXX_VERSION" = "xintel_icc12" ; then + CXXFLAGSG="$CXXFLAGSG "-std=c++0x"" + CXXFLAGSO="$CXXFLAGSO "-std=c++0x"" + fi fi fi -- 2.39.5