Mercurial > octave

changeset 30675:e52a80b55b06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 27 Jan 2022 12:43:20 +0100
parents 1182fcd6cdaf (current diff) 3ca33008c4a9 (diff)
children 50d055179c74
files configure.ac
diffstat 1 files changed, 6 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Jan 26 18:53:08 2022 -0800
+++ b/configure.ac	Thu Jan 27 12:43:20 2022 +0100
@@ -345,25 +345,16 @@
 ### Check compiler capabilities.
 
 if test $ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR = yes; then
-  ## Test for flags to fully support C++17 (with GNU extensions).
-  AX_CXX_COMPILE_STDCXX(17, ext, [])
-  if test "$HAVE_CXX17" = 0; then
-    ## A compiler supporting C++17 with GNU extensions couldn't be found.
-    ## Try without forcing GNU extensions.
-    AX_CXX_COMPILE_STDCXX(17, [], [])
-  fi
+  ## Test for flags to fully support C++17.
+  ## Preferably with GNU extensions if flags are required.
+  AX_CXX_COMPILE_STDCXX(17, [], [])
 else
   HAVE_CXX17=0
 fi
 if test "$HAVE_CXX17" = 0; then
-  ## Ensure that the C++ compiler fully supports C++11 preferably with GNU
-  ## extensions.
-  AX_CXX_COMPILE_STDCXX(11, ext, [])
-  if test "$HAVE_CXX11" = 0; then
-    ## A compiler supporting C++11 with GNU extensions couldn't be found.
-    ## Try without forcing GNU extensions.  Fail if that's not the case.
-    AX_CXX_COMPILE_STDCXX(11, [], mandatory)
-  fi
+  ## Ensure that the C++ compiler fully supports C++11.
+  ## Preferably with GNU extensions if flags are required.
+  AX_CXX_COMPILE_STDCXX(11, [], mandatory)
 fi
 
 if test $ENABLE_STD_PMR_POLYMORPHIC_ALLOCATOR = yes; then