Merge branch 'master' into l20integration

2 files changed, 51 insertions, 1 deletions

diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index f85ddb224..46d027cca 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -2432,7 +2432,7 @@ handle_union_p2p_strata_estimator (void *cls,
   if (op->byzantine_upper_bound < op->remote_element_count)
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Exceeded configured upper bound <%lu> of element: %u\n",
+         "Exceeded configured upper bound <%"PRIu64"> of element: %u\n",
          op->byzantine_upper_bound,
          op->remote_element_count);
     fail_union_operation (op);
diff --git a/src/setu/meson.build b/src/setu/meson.build
new file mode 100644
index 000000000..fe5611fd2
--- /dev/null
+++ b/src/setu/meson.build
@@ -0,0 +1,50 @@
+libgnunetsetu_src = ['setu_api.c']
+
+gnunetservicesetu_src = ['gnunet-service-setu.c',
+                         'ibf.c',
+                         'gnunet-service-setu_strata_estimator.c']
+
+configure_file(input : 'setu.conf.in',
+               output : 'setu.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
+if get_option('monolith')
+  foreach p : libgnunetsetu_src + gnunetservicesetu_src
+    gnunet_src += 'setu/' + p
+  endforeach
+  subdir_done()
+endif
+
+libgnunetsetu = library('gnunetsetu',
+        libgnunetsetu_src,
+        soversion: '0',
+        version: '0.0.0',
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
+             description : 'Provides API for accessing the set union service')
+libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
+shared_module('gnunet_plugin_block_setu_test',
+              ['plugin_block_setu_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+executable ('gnunet-service-setu',
+            gnunetservicesetu_src,
+            dependencies: [libgnunetsetu_dep,
+                           libgnunetutil_dep,
+                           m_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+