meson: modules - fix ahocorasick, mock_cmodule

diff --git a/daemon/main.c b/daemon/main.c
index b0918dcee5c35d8869fe948d648538c920c27e21..4f3b453feb87f73ff702b0d2207789ec3e6ad28a 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "kresconfig.h"
+
 #include <lua.h>
 #include <uv.h>
 #ifdef HAS_SYSTEMD
@@ -33,7 +35,6 @@
 #include <contrib/cleanup.h>
 #include <contrib/ucw/mempool.h>
 #include <contrib/ccan/asprintf/asprintf.h>
-#include "kresconfig.h"
 #include "lib/defines.h"
 #include "lib/resolve.h"
 #include "lib/dnssec.h"

diff --git a/daemon/meson.build b/daemon/meson.build
index a703533916f767e5938d093878f8743b546bcf8d..ffdb4c77cb127aba5ecf053c5cba5c358eb69fda 100644 (file)
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -25,11 +25,6 @@ config_tests += [
 ]
 
 
-# daemon CFLAGS
-kresd_c_args = [
-  '-fPIE',  # NOTE this triggers warning, but is needed for compatibility with meson 0.47.0
-]
-
 kresd_deps = [
   contrib_dep,
   kresconfig_dep,
@@ -55,7 +50,6 @@ kresd = executable(
   kresd_src,
   dependencies: kresd_deps,
   export_dynamic: true,
-  c_args: kresd_c_args,
   install: true,
   install_dir: get_option('sbindir'),
 )

diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index 0b34ea839cb1f70778fe82a858ca8d3f0867b342..8506c83924fb90a24196a6e3dca31a92fa04af64 100644 (file)
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -21,7 +21,7 @@ lua_ac_src = [
   'lua-aho-corasick/ac_slow.cxx',
 ]
 
-lua_ac_lib = library(
+lua_ac_lib = shared_library(
   'ahocorasick',
   lua_ac_src,
   dependencies: luajit,
@@ -33,5 +33,5 @@ lua_ac_lib = library(
   ],
   name_prefix: '',
   install: true,
-  install_dir: modules_dir,
+  install_dir: lib_dir,
 )

diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index f7c2a3b6eb7f203bf456e3d011dfc2ad4183aa93..43ca767508d927147d5e75de786e7598d77d2020 100644 (file)
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -5,7 +5,7 @@ mock_cmodule_src = [
   'mock_cmodule.c',
 ]
 
-mock_cmodule_lib = library(
+mock_cmodule_lib = shared_library(
   'mock_cmodule',
   mock_cmodule_src,
   name_prefix: '',