fix C++11 detection

master
Marc Wäckerlin 8 years ago
parent c0981c4f71
commit 96775db7ff
  1. 4
      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.]) AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
fi fi
else else
HAVE_CXX11=${HAVE_CXX14}
if test x$ac_success = xno; then if test x$ac_success = xno; then
HAVE_CXX14=0 HAVE_CXX14=0
AC_MSG_NOTICE([No compiler with C++14 support was found]) AC_MSG_NOTICE([No compiler with C++14 support was found])
AX_CXX_COMPILE_STDCXX_11([$1], [optional]) AX_CXX_COMPILE_STDCXX_11([$1], [optional])
else else
HAVE_CXX11=1
HAVE_CXX14=1 HAVE_CXX14=1
AC_DEFINE(HAVE_CXX14,1, AC_DEFINE(HAVE_CXX14,1,
[define if the compiler supports basic C++14 syntax]) [define if the compiler supports basic C++14 syntax])
AC_DEFINE(HAVE_CXX11,1,
[define if the compiler supports basic C++14 syntax])
fi fi
AC_SUBST(HAVE_CXX11) AC_SUBST(HAVE_CXX11)
AC_SUBST(HAVE_CXX14) AC_SUBST(HAVE_CXX14)

Loading…
Cancel
Save