diff --git a/README b/README index 7018e1fe2350fcacf831bebed5b0eb8879544f94..ce864f19c1526cc5b09f8855e3eef289dda296c2 100644 --- a/README +++ b/README @@ -23,7 +23,10 @@ Dependencies dune-common depends on the following software packages - pkg-config -- icc (C/C++) >= 7.0 or GNU C, C++ >=3.4 +- GNU C, C++ >=4.4 + these might also work: + icc (C/C++) >= 13.0 + Clang >= 3.2 The following software is recommend but optional: diff --git a/README.SVN b/README.SVN index cadd4c89082606c19b06e8031e39321f78702f56..f08a4f363c157b2106c1d6a4f0e928371a84ecc9 100644 --- a/README.SVN +++ b/README.SVN @@ -6,7 +6,7 @@ following programs installed on your system: automake >= 1.9 - autoconf >= 2.52 + autoconf >= 2.62 libtool diff --git a/m4/dune_compiler.m4 b/m4/dune_compiler.m4 index 7a83a276ef857a8460296854ac3afa62e615c005..d4d582429dac919e6755e296d354656ad5fce229 100644 --- a/m4/dune_compiler.m4 +++ b/m4/dune_compiler.m4 @@ -8,25 +8,25 @@ AC_ARG_ENABLE(compilercheck, [disable check for supported compilers]), [compilercheck=$enableval], [compilercheck=yes]) -SUPPORTED_COMPILER="gcc (>= 4.1), should work with recent versions of icc and clang (>= 3.0)" +SUPPORTED_COMPILER="gcc (>= 4.4), should work with recent versions of icc (>= 13) and clang (>= 3.2)" AC_REQUIRE([AC_PROG_CXX]) cat >conftest.cc <<_ACEOF #include <cstdio> #if defined __ICC && ! defined CXX_SUPPORTED - #if __ICC >= 700 + #if __ICC >= 1300 #define CXX_SUPPORTED "icc %2.2f", 1.0*__ICC/100 #endif #endif #if defined __clang__ && ! defined CXX_SUPPORTED - #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 0) + #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 2) #define CXX_SUPPORTED \ "clang %i.%i.%i", __clang_major__, __clang_minor__, __clang_patchlevel__ #endif #endif #if defined __GNUC__ && ! defined CXX_SUPPORTED - #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) #define CXX_SUPPORTED \ "gcc %i.%i.%i", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ #endif