-ftbfs

2 files changed, 10 insertions, 3 deletions

diff --git a/src/gns/nss/meson.build b/src/gns/nss/meson.build
index 1573acf86..3e0f6839f 100644
--- a/src/gns/nss/meson.build
+++ b/src/gns/nss/meson.build
@@ -7,7 +7,7 @@ shared_library('nss_gns',
                ['nss_gns_query.c', 'nss_gns.c'],
                dependencies: [libgnunetutil_dep,
                              libgnunetgnsrecord_dep],
-               link_args: ['-fno-version', '-module', '-export-dynamic', '-shrext', '.so.2', '-W', 'l'],
+               #link_args: ['-fno-version', '-module', '-export-dynamic', '-shrext', '.so.2', '-W', 'l'],
                include_directories: [incdir, configuration_inc],
                install: true,
                install_dir: get_option('libdir'))
@@ -16,7 +16,7 @@ shared_library('nss_gns4',
                c_args: ['-DNSS_IPV4_ONLY=1'],
                dependencies: [libgnunetutil_dep,
                              libgnunetgnsrecord_dep],
-               link_args: ['-fno-version', '-module', '-export-dynamic', '-shrext', '.so.2', '-W', 'l'],
+               #link_args: ['-fno-version', '-module', '-export-dynamic', '-shrext', '.so.2', '-W', 'l'],
                include_directories: [incdir, configuration_inc],
                install: true,
                install_dir: get_option('libdir'))
@@ -25,7 +25,7 @@ shared_library('nss_gns6',
                c_args: ['-DNSS_IPV6_ONLY=1'],
                dependencies: [libgnunetutil_dep,
                              libgnunetgnsrecord_dep],
-               link_args: ['-fno-version', '-module', '-export-dynamic', '-shrext', '.so.2', '-W', 'l'],
+               #link_args: ['-fno-version', '-module', '-export-dynamic', '-shrext', '.so.2', '-W', 'l'],
                include_directories: [incdir, configuration_inc],
                install: true,
                install_dir: get_option('libdir'))
diff --git a/src/messenger/meson.build b/src/messenger/meson.build
index 556bdd58f..2a25a7531 100644
--- a/src/messenger/meson.build
+++ b/src/messenger/meson.build
@@ -28,6 +28,13 @@ gnunetservicemessenger_src = ['gnunet-service-messenger.c',
                               'gnunet-service-messenger_room.c',
                               'gnunet-service-messenger_tunnel.c']
 
+configure_file(input : 'messenger.conf.in',
+               output : 'messenger.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
 if get_option('monolith')
   foreach p : libgnunetmessenger_src + gnunetservicemessenger_src
     gnunet_src += 'messenger/' + p