Meson: Cleanup the netlibs module

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

diff --git a/meson/net-libs/meson.build b/meson/net-libs/meson.build
index 9736d33813b2c778007c618342de1058d92cc0b7..fd494ce311096fc4c6e7844bd318585d961620a4 100644 (file)
--- a/meson/net-libs/meson.build
+++ b/meson/net-libs/meson.build
@@ -1,5 +1,4 @@
-# Network Libraries ----------------------------------------------------------------------
-# Inputs: deps conf
+netlib_deps = []
 
 variants = [
   ['inet_aton', 'resolv'],
@@ -7,6 +6,7 @@ variants = [
   ['socket', 'socket'],
   ['gethostent', 'nsl'],
 ]
+
 foreach variant: variants
   func_name = variant[0]
   lib_name = variant[1]
@@ -15,23 +15,30 @@ foreach variant: variants
   if not found
     lib = cxx.find_library(lib_name, required: true)
     if not cxx.has_function(func_name, dependencies: lib)
-      error('Cannot find function ' + func_name)
+      error('Cannot find function ' + func_name + ', searched library `' + lib_name + '`')
     endif
-    deps += lib
+    netlib_deps += lib
     found = lib.name() + ' ' + lib.version()
   endif
 
-  # summary(func_name, found, bool_yn: true, section: 'Network Functions')
+  summary(func_name, found, bool_yn: true, section: 'Networking Functions')
 endforeach
 
-variants = ['recvmmsg', 'sendmmsg', 'accept4']
+dep_netlibs = declare_dependency(dependencies: netlib_deps)
+
+variants = [
+  'recvmmsg',
+  'sendmmsg',
+  'accept4',
+]
+
 foreach variant: variants
   found = cxx.has_function(variant)
   define = 'HAVE_' + variant.to_upper()
-  conf.set10(define, found, description: 'Whether we have ' + variant)
-  # summary(variant, found, bool_yn: true, section: 'Network Functions')
+  conf.set(define, found, description: 'Have ' + variant)
+  summary(variant, found, bool_yn: true, section: 'Networking Functions')
 endforeach
 
 declared = cxx.has_header_symbol('ifaddrs.h', 'getifaddrs')
-conf.set10('HAVE_GETIFADDRS', declared, description: 'Whether we have getifaddrs')
-# summary('getifaddrs', declared, bool_yn: true, section: 'Network Functions')
+conf.set('HAVE_GETIFADDRS', declared, description: 'Have getifaddrs')
+summary('getifaddrs', declared, bool_yn: true, section: 'Networking Functions')