[gnunet] branch master updated (5afb30f1a -> 9c8d9a406)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 5afb30f1a BUILD: Meson better dependency detection heuristic
     new bb27b3fa1 -minor compile define add
     new 9c8d9a406 BUILD: Some libgnunet considerations

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 meson.build           |  2 ++
 src/block/meson.build | 47 +++++++++++++++++++++++++++++++----------------
 src/meson.build       | 29 +++++++++++++++--------------
 3 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/meson.build b/meson.build
index 718197322..e062d93e7 100644
--- a/meson.build
+++ b/meson.build
@@ -2,6 +2,8 @@
 project('gnunet', 'c', license: 'AGPLv3',
         version: run_command('sh', 'contrib/get_version.sh', check: 
true).stdout().strip())
 
+add_project_arguments('-D_GNU_SOURCE', language : 'c')
+
 cc = meson.get_compiler('c')
 incdir = include_directories('src/include')
 cdata = configuration_data()
diff --git a/src/block/meson.build b/src/block/meson.build
index aae7445ee..9cb66552c 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -1,23 +1,38 @@
 libgnunetblock_src = ['block.c']
 libgnunetblockgroup_src = ['bg_bf.c']
 
-if get_option('monolith') == false
-  libgnunetblock = library('gnunetblock',
-          libgnunetblock_src,
-          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir'))
-  libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
-  libgnunetblockgroup = library('gnunetblockgroup',
-          libgnunetblockgroup_src,
-          dependencies: [libgnunetutil_dep, libgnunetblock_dep],
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir'))
-  libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
-else
+if get_option('monolith')
   foreach p : libgnunetblock_src + libgnunetblockgroup_src
     gnunet_src += 'block/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetblock = library('gnunetblock',
+        libgnunetblock_src,
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
+libgnunetblockgroup = library('gnunetblockgroup',
+        libgnunetblockgroup_src,
+        dependencies: [libgnunetutil_dep, libgnunetblock_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
+plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep]
+shared_module('gnunet_plugin_block_test',
+      ['plugin_block_test.c'],
+      dependencies: plugin_dep,
+      include_directories: [incdir, configuration_inc],
+      install: true,
+      install_dir: get_option('libdir'))
+shared_module('gnunet_plugin_block_template',
+      ['plugin_block_template.c'],
+      dependencies: plugin_dep,
+      include_directories: [incdir, configuration_inc],
+      install: true,
+      install_dir: get_option('libdir'))
+
diff --git a/src/meson.build b/src/meson.build
index 076a8d99e..389d08245 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,19 +12,13 @@ if get_option('monolith') == false
 endif
 subdir('statistics')
 #$(TESTING)')
-if json_dep.found()
- subdir('json')
-endif
-if curl_dep.found()
-  subdir('curl')
-endif
+subdir('json', if_found : json_dep)
+subdir('curl', if_found : [curl_dep])
 if get_option('monolith') == false
   subdir('rest')
 endif
 subdir('peerinfo')
-if sqlite_dep.found()
-  subdir('sq')
-endif
+subdir('sq', if_found : [sqlite_dep])
 #subdir('$(MYSQL_DIR)')
 #subdir('$(POSTGRES_DIR)')
 subdir('datacache')
@@ -72,9 +66,16 @@ subdir('messenger')
 ##subdir('$(EXP_DIR)')
 #subdir('integration-tests')
 
-if get_option('monolith')
-  libgnunet = library('gnunet',
-                      gnunet_src,
-                      dependencies: gnunetdeps,
-                      include_directories: [incdir, configuration_inc, 
exitdir])
+if not get_option('monolith')
+  subdir_done()
 endif
+libgnunet = library('gnunet',
+                    gnunet_src,
+                    dependencies: gnunetdeps,
+                    include_directories: [incdir, configuration_inc, exitdir])
+libgnunet_dep = declare_dependency(link_with : libgnunet)
+
+# FIXME here we need to re-enter all that need to link against libgnunet
+# For example: dload plugins
+# We also need a logic that handles this
+# subdir('block')

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.