diff options
| author | Michael Welsh Duggan <md5i@cs.cmu.edu> | 2016-02-29 11:34:57 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-02-29 11:34:57 +0100 |
| commit | 401d6b8cefcc5bf3c1f6c35d76c589bb6b7387b0 (patch) | |
| tree | 85fa40168d4be03d49df85126f46c01ba91ff861 /m4/ax_cxx_compile_stdcxx.m4 | |
| parent | be5966c8d7cea729c95818469d4614995c1ecfca (diff) | |
| download | autoconf-archive-401d6b8cefcc5bf3c1f6c35d76c589bb6b7387b0.tar.gz | |
CXX_COMPILE_STDCXX: fix regression introduced in ccd1d4f54b
AX_CXX_COMPILE_STDCXX doesn't set HAVE_CXX when [mandatory] is given as
an argument. This bug has existed since commit ccd1d4f54b07b46b.
Diffstat (limited to 'm4/ax_cxx_compile_stdcxx.m4')
| -rw-r--r-- | m4/ax_cxx_compile_stdcxx.m4 | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 index 079e17d..64c9e3a 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -39,7 +39,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 1 +#serial 2 dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro dnl (serial version number 13). @@ -115,18 +115,16 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl if test x$ac_success = xno; then AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) else - if test x$ac_success = xno; then - HAVE_CXX$1=0 - AC_MSG_NOTICE([No compiler with C++$1 support was found]) - else - HAVE_CXX$1=1 - AC_DEFINE(HAVE_CXX$1,1, - [define if the compiler supports basic C++$1 syntax]) - fi - - AC_SUBST(HAVE_CXX$1) + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) fi + AC_SUBST(HAVE_CXX$1) ]) |