From 80896f324842e782c0059369df1f6742f7e96fd8 Mon Sep 17 00:00:00 2001
From: root <root@alltheacronyms.com>
Date: Thu, 30 Apr 2026 17:55:34 +0000
Subject: [PATCH] Add C++17 support to autotools macro

---
 build-aux/m4/ax_cxx_compile_stdcxx.m4 | 66 +++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/build-aux/m4/ax_cxx_compile_stdcxx.m4 b/build-aux/m4/ax_cxx_compile_stdcxx.m4
index f147cee3..22518c7f 100644
--- a/build-aux/m4/ax_cxx_compile_stdcxx.m4
+++ b/build-aux/m4/ax_cxx_compile_stdcxx.m4
@@ -10,8 +10,8 @@
 #
 #   Check for baseline language coverage in the compiler for the specified
 #   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard),
+#   '14' (for the C++14 standard), or '17' (for the C++17 standard).
 #
 #   The second argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
@@ -47,7 +47,7 @@ dnl  (serial version number 13).
 AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
   m4_if([$1], [11], [],
         [$1], [14], [],
-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
+        [$1], [17], [],
         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
   m4_if([$2], [], [],
         [$2], [ext], [],
@@ -154,6 +154,12 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
 )
 
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+)
+
 
 dnl  Tests for new features in C++11
 
@@ -566,3 +572,57 @@ namespace cxx14
 #endif  // __cplusplus >= 201402L
 
 ]])
+
+dnl  Tests for new features in C++17
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201703L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#include <type_traits>
+
+namespace cxx17
+{
+
+  namespace test_if_constexpr
+  {
+
+    template <typename T>
+    constexpr int test(T)
+    {
+      if constexpr (std::is_integral<T>::value)
+        return 1;
+      else
+        return 0;
+    }
+
+    static_assert(test(1) == 1, "");
+    static_assert(test(1.0) == 0, "");
+
+  }
+
+  namespace test_inline_variables
+  {
+
+    struct constants
+    {
+      inline static constexpr int value = 17;
+    };
+
+    static_assert(constants::value == 17, "");
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus >= 201703L
+
+]])