gnunet

commit 1d367bb8780e06f78c4119b49d2cd99f56d2315b
parent aacf3f17e7391dca8b36288ac5cfad5b2c9855f5
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Thu,  5 Jun 2025 09:47:40 +0200

build: Correctly require gnutls as optional

Diffstat:
M
meson.build
 | 
16
++++++++++------
M
src/contrib/service/consensus/meson.build
 | 
2
+-
M
src/contrib/service/secretsharing/meson.build
 | 
2
+-
M
src/service/gns/meson.build
 | 
36
+++++++++++++++++++-----------------
M
src/service/topology/meson.build
 | 
2
+-

5 files changed, 32 insertions(+), 26 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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