Meson: Cleanup libsodium module

diff --git a/meson.build b/meson.build
index 67e37444001bd030bce7773de26859bf2ae1f8e4..167d796a00675a4a5de2a6e77ff7cd842884f42d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -188,6 +188,7 @@ deps = [
   dep_lua,
   dep_lua_records,
   dep_netlibs,
+  dep_libsodium,
   dep_gss_tsig,
   dep_pkcs11,
   dep_yahttp,

diff --git a/meson/libsodium/meson.build b/meson/libsodium/meson.build
index 4e4dfec6893aebc70b00a880471d7c4a734d1dac..aba129abdbbc4b13bc9e39fb2b4331dd1827de7a 100644 (file)
--- a/meson/libsodium/meson.build
+++ b/meson/libsodium/meson.build
@@ -1,8 +1,5 @@
-# Libsodium-based signers
-# Inputs: deps conf
-
 opt_libsodium = get_option('signers-libsodium')
-dep_libsodium = dependency('libsodium', required: opt_libsodium, not_found_message: 'libsodium not found')
+dep_libsodium = dependency('libsodium', required: opt_libsodium)
 
 if dep_libsodium.found()
   funcs = [
@@ -15,12 +12,10 @@ if dep_libsodium.found()
 
   foreach func: funcs
     define = 'HAVE_' + func.to_upper()
-    has = cxx.has_function(func, dependencies: dep_libsodium)
-    conf.set10(define, has, description: 'Whether we have ' + func)
-    # summary(func, has, bool_yn: true, section: 'Libsodium Functions')
+    have_func = cxx.has_function(func, dependencies: dep_libsodium)
+    conf.set(define, have_func, description: 'Have libsodium ' + func)
   endforeach
 endif
 
-deps += dep_libsodium
-conf.set10('HAVE_LIBSODIUM', dep_libsodium.found(), description: 'Whether we build libsodium-based signers')
-summary('libsodium', dep_libsodium.found(), bool_yn: true, section: 'Configuration')
+conf.set('HAVE_LIBSODIUM', dep_libsodium.found(), description: 'libsodium-based signers')
+summary('libsodium signers', dep_libsodium.found(), bool_yn: true, section: 'Crypto')