[gnunet] branch master updated (1e686575a -> 2da4d4740)

[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 1e686575a Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
     new 8696b2eac BUILD: Fix pkgconfig generation
     new 7edc3d821 BUILD: Ftbfs fix
     new 2da4d4740 BUILD: Ftbfs fix

The 3 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:
 contrib/gana                  | 2 +-
 contrib/sphinx                | 2 +-
 src/pq/meson.build            | 1 -
 src/revocation/meson.build    | 1 +
 src/secretsharing/meson.build | 1 +
 src/seti/meson.build          | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index c1dc2dc97..c9bda2187 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit c1dc2dc975742c929a523c22d91f7d4f82787230
+Subproject commit c9bda21875ea1775f88b71de735d527132e45922
diff --git a/contrib/sphinx b/contrib/sphinx
index 9c5b9d904..0cccef450 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 9c5b9d9040d21542eff792e26624cf9669b127aa
+Subproject commit 0cccef450b037a48170402117f7d3b6c0a4272af
diff --git a/src/pq/meson.build b/src/pq/meson.build
index 7e9060b41..2a3406e28 100644
--- a/src/pq/meson.build
+++ b/src/pq/meson.build
@@ -8,7 +8,6 @@ libgnunetpq_src = ['pq.c',
                    'pq_result_helper.c']
 
 if get_option('monolith')
-else
   foreach p : libgnunetpq_src
     gnunet_src += 'pq/' + p
   endforeach
diff --git a/src/revocation/meson.build b/src/revocation/meson.build
index 51b3aa146..9a526af36 100644
--- a/src/revocation/meson.build
+++ b/src/revocation/meson.build
@@ -31,6 +31,7 @@ pkg.generate(libgnunetrevocation, url: 
'https://www.gnunet.org',
 shared_module('gnunet_plugin_block_revocation',
               ['plugin_block_revocation.c'],
               dependencies: [libgnunetutil_dep,
+                             libgnunetidentity_dep,
                              libgnunetrevocation_dep,
                              libgnunetblock_dep],
               include_directories: [incdir, configuration_inc],
diff --git a/src/secretsharing/meson.build b/src/secretsharing/meson.build
index b6e31a593..177cd1bee 100644
--- a/src/secretsharing/meson.build
+++ b/src/secretsharing/meson.build
@@ -34,6 +34,7 @@ executable ('gnunet-service-secretsharing',
             dependencies: [libgnunetsecretsharing_dep,
                            libgnunetutil_dep,
                            gcrypt_dep,
+                           m_dep,
                            libgnunetconsensus_dep,
                            libgnunetstatistics_dep,
                            libgnunetdatacache_dep],
diff --git a/src/seti/meson.build b/src/seti/meson.build
index d61fffbb7..0741cac18 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -24,7 +24,7 @@ libgnunetseti = library('gnunetseti',
         include_directories: [incdir, configuration_inc],
       install: true,
       install_dir: get_option('libdir'))
-pkg.generate(libgnunetarm, url: 'https://www.gnunet.org',
+pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set intersection 
service')
 libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
 executable ('gnunet-service-seti',

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