Meson: Cleanup dlopen module

diff --git a/meson.build b/meson.build
index fffd80aff8dfb85c09d4662ba3879df00a69b958..7be9c68451780f43d035c59a09b59daaabacbc13 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -199,6 +199,7 @@ deps = [
   dep_gss_tsig,
   dep_unittests,
   dep_backend_unittests,
+  dep_dlopen,
   dep_pkcs11,
   dep_yahttp,
   dep_json11,

diff --git a/meson/dlopen/meson.build b/meson/dlopen/meson.build
index bc82c7e350f626c6e4744647bb2252394401a182..7737e842b298cc7aec6a1033b04ab4e7b79af593 100644 (file)
--- a/meson/dlopen/meson.build
+++ b/meson/dlopen/meson.build
@@ -1,16 +1,15 @@
-# dlopen
-# Inputs: cxx deps
+dep_dlopen = declare_dependency(variables: {'name': 'fooooo'}, version: 'system')
 
-# dep_dlopen = dependency('dl', required: true) # TODO Meson 0.62
-# deps += dep_dlopen
+if not cxx.has_function('dlopen')
+  dep_dlopen = dependency('dl', required: false)
 
-if cxx.has_function('dlopen')
-  subdir_done()
-endif
+  if not dep_dlopen.found()
+    dep_dlopen = cxx.find_library('dl', required: true)
 
-dl = cxx.find_library('dl', required: true)
-if not cxx.has_function('dlopen', dependencies: dl)
-  error('Your system does not support dlopen')
+    if not cxx.has_function('dlopen', dependencies: dep_dlopen)
+      error('Your system does not support dlopen')
+    endif
+  endif
 endif
 
-deps += dl
+summary('dlopen', dep_dlopen.found(), bool_yn: true, section: 'System')