From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 11 Feb 2019 18:22:42 +0000 (+0100)
Subject: meson: modules - fix ahocorasick, mock_cmodule
X-Git-Tag: v4.0.0~24^2~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=635fedd6d71e3f9c0ccd9c2f0146147980febfc4;p=thirdparty%2Fknot-resolver.git

meson: modules - fix ahocorasick, mock_cmodule
---

diff --git a/daemon/main.c b/daemon/main.c
index b0918dcee..4f3b453fe 100644
--- 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 a70353391..ffdb4c77c 100644
--- 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 0b34ea839..8506c8392 100644
--- 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 f7c2a3b6e..43ca76750 100644
--- 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: '',