Meson: Cleanup librt module

diff --git a/meson.build b/meson.build
index 04a6dc01754e03566ef7c1ce7c8e9728e59fafd9..e14ec1fe8752336b7cdf18c4537a21f7881cd8b2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -193,6 +193,7 @@ deps = [
   dep_libcrypto,
   dep_libssl,
   dep_gnutls,
+  dep_rt,
   dep_gss_tsig,
   dep_pkcs11,
   dep_yahttp,

diff --git a/meson/clock-gettime/meson.build b/meson/clock-gettime/meson.build
index 63998dfe3a45e45a02a72a50e4cf41a8698946c1..673817f5f8db9f9853a9b4a618aef24b594ddbff 100644 (file)
--- a/meson/clock-gettime/meson.build
+++ b/meson/clock-gettime/meson.build
@@ -1,17 +1,17 @@
-# Clock_gettime
-# Inputs: deps
-
 found = cxx.has_function('clock_gettime')
+dep_rt = dependency('', required: false)
 
 if not found
-  lib = cxx.find_library('rt', required: true)
+  dep_rt = cxx.find_library('rt', required: true)
 
-  if not cxx.has_function('clock_gettime', dependencies: lib)
-    error('Cannot find function ' + 'clock_gettime')
+  if not cxx.has_function('clock_gettime', dependencies: dep_rt)
+    error('Cannot find function `clock_gettime`')
   endif
-
-  deps += lib
-  found = lib.name() + ' ' + lib.version()
 endif
 
-summary('clock_gettime', found, bool_yn: true, section: 'System')
+summary('clock_gettime', true, bool_yn: true, section: 'System')
+
+if dep_rt.found()
+  summary('rt library', dep_rt.name(), bool_yn: true, section: 'System')
+  summary('rt library version', dep_rt.version(), bool_yn: true, section: 'System')
+endif