From d0be17d6bf7437bec0b4d158899d89f54ede169b Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <GabrielDosReis@users.noreply.github.com>
Date: Thu, 28 Jul 2022 19:37:02 -0700
Subject: Require C++17.

---
 config/open-axiom.m4 | 8 ++++----
 configure            | 4 ++--
 configure.ac         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 3ee8ceb5..fce469bd 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -258,16 +258,16 @@ esac
 ])
 
 dnl -----------------------------
-dnl -- OPENAXIOM_REQUIRE_CXX14 --
+dnl -- OPENAXIOM_REQUIRE_CXX17 --
 dnl -----------------------------
-AC_DEFUN([OPENAXIOM_REQUIRE_CXX14],[
+AC_DEFUN([OPENAXIOM_REQUIRE_CXX17],[
 oa_saved_cxxflags=$CXXFLAGS
-CXXFLAGS="-std=c++14"
+CXXFLAGS="-std=c++17"
 AC_MSG_CHECKING([whether $CXX supports $CXXFLAGS])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
   [AC_MSG_RESULT([yes])]
   [CXXFLAGS="$CXXFLAGS $oa_saved_cxxflags"],
-  [AC_MSG_ERROR([OpenAxiom requires a C++11 compiler])])
+  [AC_MSG_ERROR([OpenAxiom requires a C++17 compiler])])
 ])
 
 dnl -------------------------------
diff --git a/configure b/configure
index e77bbe9c..b7240475 100755
--- a/configure
+++ b/configure
@@ -6374,7 +6374,7 @@ fi
 
 
 oa_saved_cxxflags=$CXXFLAGS
-CXXFLAGS="-std=c++14"
+CXXFLAGS="-std=c++17"
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports $CXXFLAGS" >&5
 printf %s "checking whether $CXX supports $CXXFLAGS... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6394,7 +6394,7 @@ then :
 printf "%s\n" "yes" >&6; }
   CXXFLAGS="$CXXFLAGS $oa_saved_cxxflags"
 else $as_nop
-  as_fn_error $? "OpenAxiom requires a C++11 compiler" "$LINENO" 5
+  as_fn_error $? "OpenAxiom requires a C++17 compiler" "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
diff --git a/configure.ac b/configure.ac
index e2ea673e..9ffdd62b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ AC_LANG([C++])
 
 OPENAXIOM_HOST_COMPILERS
 AM_CONDITIONAL([OA_USE_LLVM], [test -n $oa_use_llvm])
-OPENAXIOM_REQUIRE_CXX14
+OPENAXIOM_REQUIRE_CXX17
 OPENAXIOM_EXTRA_CXX_OPTIONS
 AM_CONDITIONAL([OA_BUILD_GCL], [test x$oa_include_gcl = xyes])
 AM_CONDITIONAL([OA_ECL_RT], [test x$oa_lisp_flavor = xecl])
-- 
cgit v1.2.3