Process review comments, add check for a config.h file in src dir

diff --git a/meson/boost-context/meson.build b/meson/boost-context/meson.build
index ae3ad16859a64f5d4f0d9e3c64d9c0423f6b6c91..502a8a5ef709e6e1b776827dded400d366e69951 100644 (file)
--- a/meson/boost-context/meson.build
+++ b/meson/boost-context/meson.build
@@ -1,6 +1,5 @@
-# XXX ATM only boost context, no SystemV fallback as it is obsolete anyway
-
 dep_boost_context = dependency('boost', modules: ['context'], required: true)
+# Fixed value, we no longer support SystemV
 conf.set('HAVE_BOOST_CONTEXT', true)
 summary('Context', dep_boost_context.found(), bool_yn: true, section: 'Boost')
 

diff --git a/meson/boost/meson.build b/meson/boost/meson.build
index 86507537060cad55e1bffe39a889fa7f56d16c2e..943f0c4d803686822215c8641f520e4a609898fa 100644 (file)
--- a/meson/boost/meson.build
+++ b/meson/boost/meson.build
@@ -3,7 +3,6 @@ dep_boost = dependency('boost', version: '>= 1.42', required: true)
 # with C++11.
 have_boost_1_48_0 = dep_boost.version().version_compare('>= 1.48.0')
 conf.set('HAVE_BOOST_GE_148', have_boost_1_48_0, description: 'Boost version >= 1.48.0')
-conf.set('HAVE_BOOST_CONTAINER_FLAT_SET_HPP', have_boost_1_48_0, description: 'Boost version >= 1.48.0 has boost::container::flat_set')
 # conf.set('BOOST_CONTAINER_USE_STD_EXCEPTIONS', true, description: 'Boost use std exceptions')
 add_project_arguments('-DBOOST_CONTAINER_USE_STD_EXCEPTIONS', language: ['c', 'cpp'])
 summary('Boost', dep_boost.found(), bool_yn: true, section: 'Boost')

diff --git a/pdns/recursordist/ext/yahttp/meson.build b/pdns/recursordist/ext/yahttp/meson.build
deleted file mode 100644 (file)
index 49a402524e9928ba532a90856348cbe390e30209..0000000000000000000000000000000000000000
--- a/pdns/recursordist/ext/yahttp/meson.build
+++ /dev/null
@@ -1,3 +0,0 @@
-module_dist = ['LICENSE', 'README.md']
-
-subdir('yahttp')

diff --git a/pdns/recursordist/ext/yahttp/meson.build b/pdns/recursordist/ext/yahttp/meson.build
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..89a718d91606a9e409d74d521057592b709b7be4
--- /dev/null
+++ b/pdns/recursordist/ext/yahttp/meson.build
@@ -0,0 +1 @@
+../../../../ext/yahttp/meson.build
\ No newline at end of file

diff --git a/pdns/recursordist/ext/yahttp/yahttp/meson.build b/pdns/recursordist/ext/yahttp/yahttp/meson.build
deleted file mode 100644 (file)
index 2704d4798cc714dd79b32e2e6142d6e9274bd6b3..0000000000000000000000000000000000000000
--- a/pdns/recursordist/ext/yahttp/yahttp/meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
-lib_yahttp = static_library(
-  'yahttp',
-  'reqresp.cpp',
-  'router.cpp',
-  extra_files: [
-    'cookie.hpp',
-    'exception.hpp',
-    'reqresp.hpp',
-    'router.hpp',
-    'url.hpp',
-    'utility.hpp',
-    'yahttp-config.h',
-    'yahttp.hpp',
-  ],
-  cpp_args: '-Wno-overloaded-virtual',
-  dependencies: [dep_pdns],
-)
-
-dep_yahttp = declare_dependency(
-  link_with: lib_yahttp,
-  include_directories: include_directories('..'),
-)

diff --git a/pdns/recursordist/ext/yahttp/yahttp/meson.build b/pdns/recursordist/ext/yahttp/yahttp/meson.build
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..471962bc04b36b330defaa9943f500f27a634478
--- /dev/null
+++ b/pdns/recursordist/ext/yahttp/yahttp/meson.build
@@ -0,0 +1 @@
+../../../../../ext/yahttp/yahttp/meson.build
\ No newline at end of file

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index a53266c9180f070b08e5cd31063422fe815acf93..2c47ffb350c28341ae0f4a591f238fbf7f29a02e 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -200,9 +200,22 @@ foreach name, info: conditional_sources
   endif
 endforeach
 
+conf.set('HAVE_BOOST_CONTAINER_FLAT_SET_HPP', have_boost_1_48_0, description: 'Boost version >= 1.48.0 has boost::container::flat_set')
+
 # Generate config.h
 config_h = configure_file(configuration: conf, output: 'config.h')
 
+sh_program = find_program('sh')
+dep_no_config_in_source_check = custom_target(
+    input: [],
+    output: ['config.h file in source directory check'],
+    command: [sh_program, '-c', 'test ! -e @SOURCE_ROOT@/config.h'],
+    build_always_stale: true,
+)
+dep_no_config_in_source = declare_dependency(
+  sources: dep_no_config_in_source_check
+)
+
 html_sources = [
   src_dir / 'html/index.html',
   src_dir / 'html/local-2022.js',
@@ -237,6 +250,7 @@ dep_htmlfiles = declare_dependency(
 
 deps = [
   dep_pdns,
+  dep_no_config_in_source,
   dep_settings,
   dep_rust_settings,
   dep_boost,