From 96775db7fff5e8b758939b111d0c9d3987fc7e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 19 Aug 2016 16:07:37 +0000 Subject: [PATCH] fix C++11 detection --- scripts/ax_cxx_compile_stdcxx_11.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ax_cxx_compile_stdcxx_11.m4 b/scripts/ax_cxx_compile_stdcxx_11.m4 index e3c8d75..4c831e0 100644 --- a/scripts/ax_cxx_compile_stdcxx_11.m4 +++ b/scripts/ax_cxx_compile_stdcxx_11.m4 @@ -201,15 +201,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [dnl AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.]) fi else - HAVE_CXX11=${HAVE_CXX14} if test x$ac_success = xno; then HAVE_CXX14=0 AC_MSG_NOTICE([No compiler with C++14 support was found]) AX_CXX_COMPILE_STDCXX_11([$1], [optional]) else + HAVE_CXX11=1 HAVE_CXX14=1 AC_DEFINE(HAVE_CXX14,1, [define if the compiler supports basic C++14 syntax]) + AC_DEFINE(HAVE_CXX11,1, + [define if the compiler supports basic C++14 syntax]) fi AC_SUBST(HAVE_CXX11) AC_SUBST(HAVE_CXX14)