From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Thu, 7 Sep 2023 11:59:13 +0000 (+0200)
Subject: Meson: Move detection of tm_gmtoff to YaHTTP
X-Git-Tag: rec-5.1.0-alpha1~80^2~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87bb3eae9cde3a9215b4af0498bcb40a34ab9d4a;p=thirdparty%2Fpdns.git

Meson: Move detection of tm_gmtoff to YaHTTP
---

diff --git a/ext/yahttp/yahttp/meson.build b/ext/yahttp/yahttp/meson.build
index 2704d4798c..b5a8ecb393 100644
--- a/ext/yahttp/yahttp/meson.build
+++ b/ext/yahttp/yahttp/meson.build
@@ -1,3 +1,12 @@
+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 e5a04f2380..9a2108678f 100644
--- a/meson.build
+++ b/meson.build
@@ -48,7 +48,6 @@ 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' / 'libsodium')               # Libsodium-based signers
 subdir('meson' / 'libdecaf')                # Libdecaf-based signers
 subdir('meson' / 'libcrypto')               # OpenSSL-based signers
diff --git a/meson/tm-gmtoff/meson.build b/meson/tm-gmtoff/meson.build
deleted file mode 100644
index e583aa0b47..0000000000
--- a/meson/tm-gmtoff/meson.build
+++ /dev/null
@@ -1,8 +0,0 @@
-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')