From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Fri, 8 Sep 2023 07:34:01 +0000 (+0200)
Subject: Meson: Revert the integration of detecting tm-gmtoff in YaHTTP
X-Git-Tag: rec-5.1.0-alpha1~80^2~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=111d721e2be9604f4ef9520a8c022198e57e2683;p=thirdparty%2Fpdns.git

Meson: Revert the integration of detecting tm-gmtoff in YaHTTP
---

diff --git a/ext/yahttp/yahttp/meson.build b/ext/yahttp/yahttp/meson.build
index b5a8ecb393..2704d4798c 100644
--- a/ext/yahttp/yahttp/meson.build
+++ b/ext/yahttp/yahttp/meson.build
@@ -1,12 +1,3 @@
-prefix = '''
-#include <sys/types.h>
-#include <time.h>
-'''
-
-has = cxx.has_member('struct tm', 'tm_gmtoff', prefix: prefix)
-conf.set('HAVE_TM_GMTOFF', has, description: 'Whether tm_gmtoff is available')
-summary('tm_gmtoff', has, bool_yn: true, section: 'YaHTTP')
-
 lib_yahttp = static_library(
   'yahttp',
   'reqresp.cpp',
diff --git a/meson.build b/meson.build
index 12eaeb24e9..7ae39c36e1 100644
--- a/meson.build
+++ b/meson.build
@@ -45,6 +45,7 @@ subdir('meson' / 'lua-records')             # Lua-based Records
 subdir('meson' / 'hardening')               # Hardening
 subdir('meson' / 'kiss-rng')                # Unsafe KISS RNG
 subdir('meson' / 'net-libs')                # Network Libraries
+subdir('meson' / 'tm-gmtoff')               # Check for tm_gmtoff field in struct tm
 subdir('meson' / 'mmap')                    # Check for mmap
 subdir('meson' / 'libsodium')               # Libsodium-based signers
 subdir('meson' / 'libdecaf')                # Libdecaf-based signers
diff --git a/meson/tm-gmtoff/meson.build b/meson/tm-gmtoff/meson.build
new file mode 100644
index 0000000000..e583aa0b47
--- /dev/null
+++ b/meson/tm-gmtoff/meson.build
@@ -0,0 +1,8 @@
+prefix = '''
+#include <sys/types.h>
+#include <time.h>
+'''
+
+has = cxx.has_member('struct tm', 'tm_gmtoff', prefix: prefix)
+conf.set('HAVE_TM_GMTOFF', has, description: 'Whether tm_gmtoff is available')
+summary('tm_gmtoff', has, bool_yn: true, section: 'System')