From b3ae05752fc88fa217cf9f5aefac55e3acd43a50 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Wed, 8 Mar 2017 12:09:14 +0100
Subject: [PATCH] changed error to warning
This is required since intel compiler does not have complete c++11
support but still works correctly.
Perhaps we have to find a way to include intel compiler on travis
so as to be sure we do not include unsupported c++11 features.
---
configure | 15 +++++++++++++--
configure.ac | 12 ++++++++++--
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 0b4f7aef7..1be0621d3 100755
--- a/configure
+++ b/configure
@@ -5075,14 +5075,25 @@ main ()
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+$as_echo "yes" >&6; };
+ support_cxx11=true
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } ;
- as_fn_error $? "C++11 support is required" "$LINENO" 5
+ support_cxx11=false
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$support_cxx11" = false
+then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++11 support is required as of PLUMED 2.4" >&5
+$as_echo "$as_me: WARNING: C++11 support is required as of PLUMED 2.4" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your compiler appears not to support C++11" >&5
+$as_echo "$as_me: WARNING: your compiler appears not to support C++11" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please change compiler of make sure that everything works correctly" >&5
+$as_echo "$as_me: WARNING: please change compiler of make sure that everything works correctly" >&2;}
+fi
+
diff --git a/configure.ac b/configure.ac
index be80486cd..2d6938893 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,9 +288,17 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
this_compiler_does_not_support_cxx11
#endif
])],
- [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([yes])];
+ support_cxx11=true,
[AC_MSG_RESULT([no]) ;
- AC_MSG_ERROR([C++11 support is required])])
+ support_cxx11=false])
+
+if test "$support_cxx11" = false
+then
+ AC_MSG_WARN([C++11 support is required as of PLUMED 2.4])
+ AC_MSG_WARN([your compiler appears not to support C++11])
+ AC_MSG_WARN([please change compiler of make sure that everything works correctly])
+fi
--
GitLab