From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 8 Sep 2025 10:13:29 +0000 (+0200)
Subject: Use gnu++20 instead of c++20, according to Habbie it makes porting to e.g. Suse and... 
X-Git-Tag: rec-5.4.0-alpha1~100^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf0353042743a4b819ea4627d0e0aa9dd6ec665;p=thirdparty%2Fpdns.git

Use gnu++20 instead of c++20, according to Habbie it makes porting to e.g. Suse and Haiku easier.

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/configure.ac b/configure.ac
index 07bc4d78d5..3e4177cea5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ PDNS_CHECK_FLEX
 # Warn when pkg.m4 is missing
 m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config])
 
-AX_CXX_COMPILE_STDCXX_20([noext], [mandatory])
+AX_CXX_COMPILE_STDCXX_20([ext], [mandatory])
 LT_PREREQ([2.2.2])
 LT_INIT([disable-static dlopen])
 
diff --git a/meson.build b/meson.build
index 253ddfa284..5736de86d3 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ project(
   default_options: [
     'buildtype=debugoptimized',
     'warning_level=2',          # TODO Move this to 3 to enable -Wpedantic
-    'cpp_std=c++20',
+    'cpp_std=gnu++20',
   ],
 )
 
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 2e507266f1..00fea50383 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -148,7 +148,7 @@ PDNS_CHECK_LMDB
 PDNS_ENABLE_IPCIPHER
 PDNS_CHECK_AARCH64_UINT64X2_T
 
-AX_CXX_COMPILE_STDCXX_20([noext], [mandatory])
+AX_CXX_COMPILE_STDCXX_20([ext], [mandatory])
 
 AC_MSG_CHECKING([whether we will enable compiler security checks])
 AC_ARG_ENABLE([hardening],
diff --git a/pdns/dnsdistdist/meson.build b/pdns/dnsdistdist/meson.build
index 8c248f70b4..84c59f5926 100644
--- a/pdns/dnsdistdist/meson.build
+++ b/pdns/dnsdistdist/meson.build
@@ -8,7 +8,7 @@ project(
   default_options: [
     'buildtype=debugoptimized',
     'warning_level=2',          # TODO Move this to 3 to enable -Wpedantic
-    'cpp_std=c++20',
+    'cpp_std=gnu++20',
     'b_pie=true',
   ],
 )
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 33779db9d1..27bdcf1965 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -32,7 +32,7 @@ CPPFLAGS="-DRECURSOR $CPPFLAGS"
 # Warn when pkg.m4 is missing
 m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config])
 
-AX_CXX_COMPILE_STDCXX_20([noext], [mandatory])
+AX_CXX_COMPILE_STDCXX_20([ext], [mandatory])
 PDNS_CHECK_CARGO([1.64])
 
 # Rust runtime used dlopen from its static lib
diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 0a81a05c12..0f64b83c82 100644
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -8,7 +8,7 @@ project(
   default_options: [
     'buildtype=debugoptimized',
     'warning_level=2',          # TODO Move this to 3 to enable -Wpedantic
-    'cpp_std=c++20',
+    'cpp_std=gnu++20',
   ],
 )