[gnunet] branch master updated (aacf3f17e -> ec7598550)

[Admin]

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

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

    from aacf3f17e build: add buildting option conversion for meson coverage 
targets
     new 1d367bb87 build: Correctly require gnutls as optional
     new ec7598550 doc: Update dependencies in readme

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:
 README                                        | 27 ++++++++++----------
 meson.build                                   | 16 +++++++-----
 src/contrib/service/consensus/meson.build     |  2 +-
 src/contrib/service/secretsharing/meson.build |  2 +-
 src/service/gns/meson.build                   | 36 ++++++++++++++-------------
 src/service/topology/meson.build              |  2 +-
 6 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/README b/README
index a39bebb15..658923c2d 100644
--- a/README
+++ b/README
@@ -89,8 +89,6 @@ Direct dependencies of GNUnet:
 
 - Bash                              (for some scripts)
 - gettext            >= 0.21
-- gnutls             >= 3.2.12      (highly recommended a gnutls
-                                     linked against libunbound)
 - libcurl            >= 7.85.0      (ideally built against gnutls)
 - libgcrypt          >= 1.6
 - libgmp             any            (is also an indirect dependency of gcrypt)
@@ -122,26 +120,27 @@ Dependencies of optional components/functionality:
 - Transport plugins:
   * bluez (bluetooth transport)
 - Conversation service:
-  * libopus            >= 1.0.1
-  * libpulse           >= 2.0
-  * libogg             >= 1.3.0
+  * libopus          >= 1.0.1
+  * libpulse         >= 2.0
+  * libogg           >= 1.3.0
 - File-sharing metadata (highly recommended[*5]):
-  * libextractor       >= 0.6.1
+  * libextractor     >= 0.6.1
 - NAT uPnP support:
   * miniupnpc
 - gnunet-qr (Read/write GNUnet URIs from/to QR codes):
-  * libzbar            >= 0.10
+  * libzbar          >= 0.10
 - gnunet-bcd (GNS business card generator):
-  * TeX Live           >= 2012        (for gnunet-bcd[*])
-- Documentation:
-  * TeX Live           >= 2012        (for gnunet-bcd[*])
-
+  * TeX Live         >= 2012        (for gnunet-bcd[*])
+- gnunet-gns-proxy (Reverse SOCKS proxy for GNS lookups)
+  * gnutls           >= 3.2.12      (highly recommended a gnutls
+                                       linked against libunbound)
 - PABC credential support
-  * libpabc            any            (for re:claimID zero-knowledge privacy
+  * libpabc          any            (for re:claimID zero-knowledge privacy
                                       credentials)
 - re:claimID OpenID Connect plugin
-  * libjose            any            (for re:claimID OpenID Connect support)
-
+  * libjose          any            (for re:claimID OpenID Connect support)
+- gnunet-bcd:
+  * TeX Live         >= 2012
 
 Additional dependencies to run the GNUnet testsuite:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/meson.build b/meson.build
index 8ef3e1d14..e77f94a12 100644
--- a/meson.build
+++ b/meson.build
@@ -230,7 +230,7 @@ gnutls_dep = dependency('libgnutls', required: false)
 if not gnutls_dep.found()
     gnutls_dep = cc.find_library('gnutls', required: false)
     if not gnutls_dep.found()
-        gnutls_dep = cc.find_library('gnutls-dane', required: true)
+        gnutls_dep = cc.find_library('gnutls-dane', required: false)
     endif
 endif
 sodium_dep = dependency('libsodium', required: false, version: '>=1.0.18')
@@ -273,7 +273,7 @@ nghttp3_dep = dependency('libnghttp3', required: false)
 if not nghttp3_dep.found()
     nghttp3_dep = cc.find_library('nghttp3', required: false)
 endif
-http3_enabled = ngtcp2_dep.found() and ngtcp2_crypto_dep.found() and 
nghttp3_dep.found()
+http3_enabled = ngtcp2_dep.found() and ngtcp2_crypto_dep.found() and 
nghttp3_dep.found() and gnutls_dep.found()
 if http3_enabled
     message('HTTP3 enabled')
 endif
@@ -683,9 +683,11 @@ subdir('doc')
 subdir('contrib')
 subdir('data')
 
-run_target('doxygen',
-  command : 'scripts/doxygen.meson.sh',
-  env: {'PACKAGE_VERSION': version})
+run_target(
+    'doxygen',
+    command: 'scripts/doxygen.meson.sh',
+    env: {'PACKAGE_VERSION': version},
+)
 meson.add_dist_script('meson-dist-script')
 
 gnunet_prefix = get_option('prefix') / get_option('libdir')
@@ -709,7 +711,9 @@ summary(
         'compiler': cc.get_id(),
         'libdir': get_option('libdir'),
         'datadir': get_option('datadir'),
-        'default network interface': 
private_config.get('GNUNET_DEFAULT_INTERFACE'),
+        'default network interface': private_config.get(
+            'GNUNET_DEFAULT_INTERFACE',
+        ),
     },
     section: 'Detected system',
 )
diff --git a/src/contrib/service/consensus/meson.build 
b/src/contrib/service/consensus/meson.build
index 51ea61f8a..bec965ecd 100644
--- a/src/contrib/service/consensus/meson.build
+++ b/src/contrib/service/consensus/meson.build
@@ -12,7 +12,7 @@ configure_file(
 
 # FIXME needs new seti/setu
 if get_option('monolith')
-#foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
+    #foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
     #  gnunet_src += 'consensus/' + p
     #endforeach
 endif
diff --git a/src/contrib/service/secretsharing/meson.build 
b/src/contrib/service/secretsharing/meson.build
index a2d2f85cf..a3bc70bb3 100644
--- a/src/contrib/service/secretsharing/meson.build
+++ b/src/contrib/service/secretsharing/meson.build
@@ -15,7 +15,7 @@ configure_file(
 
 # FIXME needs new seti/setu
 if get_option('monolith')
-#foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src
+    #foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src
     #  gnunet_src += 'secretsharing/' + p
     #endforeach
 endif
diff --git a/src/service/gns/meson.build b/src/service/gns/meson.build
index 1f49fd13c..e04505b26 100644
--- a/src/service/gns/meson.build
+++ b/src/service/gns/meson.build
@@ -51,23 +51,25 @@ pkg.generate(
     description: 'Provides API to access the GNU Name System',
 )
 
-executable(
-    'gnunet-gns-proxy',
-    gnunetgnsproxy_src,
-    install_rpath: rpath_option,
-    dependencies: [
-        libgnunetgns_dep,
-        libgnunetutil_dep,
-        mhd_dep,
-        idn_dep,
-        curl_dep,
-        gnutls_dep,
-        libgnunetidentity_dep,
-    ],
-    include_directories: [incdir, configuration_inc],
-    install: true,
-    install_dir: get_option('libdir') / 'gnunet' / 'libexec',
-)
+if gnutls_dep.found()
+    executable(
+        'gnunet-gns-proxy',
+        gnunetgnsproxy_src,
+        install_rpath: rpath_option,
+        dependencies: [
+            libgnunetgns_dep,
+            libgnunetutil_dep,
+            mhd_dep,
+            idn_dep,
+            curl_dep,
+            gnutls_dep,
+            libgnunetidentity_dep,
+        ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir') / 'gnunet' / 'libexec',
+    )
+endif
 
 executable(
     'gnunet-service-gns',
diff --git a/src/service/topology/meson.build b/src/service/topology/meson.build
index 286b30d55..f05d0f3d7 100644
--- a/src/service/topology/meson.build
+++ b/src/service/topology/meson.build
@@ -10,7 +10,7 @@ configure_file(
 
 
 if get_option('monolith')
-# FIXME add daemon when new daemon macro is ported/ready for it.
+    # FIXME add daemon when new daemon macro is ported/ready for it.
     #foreach p : libgnunetfriends_src
     #  gnunet_src += 'topology/' + p
     #endforeach

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