Merge remote-tracking branch 'origin/master' into 6.0

10 files changed, 16 insertions, 20 deletions

diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build
index e2faed58..3fa8d3cf 100644
--- a/modules/bogus_log/meson.build
+++ b/modules/bogus_log/meson.build
@@ -9,7 +9,7 @@ c_src_lint += bogus_log_src
 bogus_log_mod = shared_module(
   'bogus_log',
   bogus_log_src,
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build
index e8a94bf1..038bf3e3 100644
--- a/modules/dnstap/meson.build
+++ b/modules/dnstap/meson.build
@@ -43,11 +43,10 @@ if build_dnstap
   dnstap_mod = shared_module(
     'dnstap',
     dnstap_src,
-    dependencies: [
+    dependencies: mod_deps + [
       declare_dependency(sources: dnstap_pb),
       libfstrm,
       libprotobuf_c,
-      libknot,
     ],
     include_directories: mod_inc_dir,
     name_prefix: '',
diff --git a/modules/edns_keepalive/meson.build b/modules/edns_keepalive/meson.build
index d125ec45..8370cdb1 100644
--- a/modules/edns_keepalive/meson.build
+++ b/modules/edns_keepalive/meson.build
@@ -9,7 +9,7 @@ c_src_lint += edns_keepalive_src
 edns_keepalive_mod = shared_module(
   'edns_keepalive',
   edns_keepalive_src,
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/extended_error/meson.build b/modules/extended_error/meson.build
index 15a1772f..9de514af 100644
--- a/modules/extended_error/meson.build
+++ b/modules/extended_error/meson.build
@@ -9,9 +9,7 @@ c_src_lint += extended_error_src
 extended_error_mod = shared_module(
   'extended_error',
   extended_error_src,
-  dependencies: [
-    libknot,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index b8379181..d5046cb4 100644
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -9,10 +9,7 @@ c_src_lint += hints_src
 hints_mod = shared_module(
   'hints',
   hints_src,
-  dependencies: [
-    libknot,
-    luajit,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/http/meson.build b/modules/http/meson.build
index a36e9ebd..9d20c929 100644
--- a/modules/http/meson.build
+++ b/modules/http/meson.build
@@ -45,7 +45,7 @@ install_subdir(
 )
 
 # auxiliary debug library for HTTP module - doesn't compile on Cygwin
-if openssl.found() and host_machine.system() != 'cygwin'
+if openssl.found() and host_machine.system() not in [ 'cygwin', 'darwin' ]
   debug_opensslkeylog_mod = shared_module(
     'debug_opensslkeylog',
     ['debug_opensslkeylog.c'],
diff --git a/modules/meson.build b/modules/meson.build
index 73444e99..5ffe95f8 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -36,6 +36,13 @@ integr_tests += [
 mod_inc_dir = include_directories('..', '../contrib',
   luajit.get_pkgconfig_variable('includedir'))
 
+mod_deps = [
+  contrib_dep,
+  libknot,
+  libuv,
+  luajit,
+]
+
 # handle more complex C/LUA modules separately
 subdir('bogus_log')
 # cookies module is not currently used
diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index 354e70b9..3c418bc9 100644
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -9,10 +9,7 @@ c_src_lint += nsid_src
 nsid_mod = shared_module(
   'nsid',
   nsid_src,
-  dependencies: [
-    libknot,
-    luajit,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/refuse_nord/meson.build b/modules/refuse_nord/meson.build
index 5142ded6..7dc8b888 100644
--- a/modules/refuse_nord/meson.build
+++ b/modules/refuse_nord/meson.build
@@ -13,7 +13,7 @@ c_src_lint += refuse_nord_src
 refuse_nord_mod = shared_module(
   'refuse_nord',
   refuse_nord_src,
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index cb4ccd68..e1f4a49c 100644
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -14,9 +14,7 @@ integr_tests += [
 stats_mod = shared_module(
   'stats',
   stats_src,
-  dependencies: [
-    libknot,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,