Meson: Cleanup LDAP module

diff --git a/meson/ldap/meson.build b/meson/ldap/meson.build
index b309bd4df85fcd44bc94378a8e744b9ba84d20ea..4a95301be70c82f3e6a6944e54269dd35faac018 100644 (file)
--- a/meson/ldap/meson.build
+++ b/meson/ldap/meson.build
@@ -1,9 +1,25 @@
-# LDAP
-# Outputs: deps_ldap
+dep_ldap = dependency('ldap', required: true)
+dep_lber = dependency('lber', required: true)
+dep_krb5 = dependency('krb5', required: true)
 
-deps_ldap  = [dependency('ldap', required: true)]
-deps_ldap += dependency('lber', required: true)
-deps_ldap += dependency('krb5', required: true)
+conf.set('LDAP', dep_ldap.found(), description: 'LDAP')
 
-conf.set10('LDAP', true, description: 'Enable LDAP')
-summary('LDAP', 'With libldap ' + deps_ldap[0].version() + ', liblber ' + deps_ldap[1].version() + ' and krb5 ' + deps_ldap[2].version(), bool_yn: true, section: 'Configuration')
+summary('LDAP', dep_ldap.found(), bool_yn: true, section: 'LDAP')
+summary('LDAP Name', dep_ldap.name(), section: 'LDAP')
+summary('LDAP Version', dep_ldap.version(), section: 'LDAP')
+
+summary('LBER', dep_lber.found(), bool_yn: true, section: 'LDAP')
+summary('LBER Name', dep_lber.name(), section: 'LDAP')
+summary('LBER Version', dep_lber.version(), section: 'LDAP')
+
+summary('Krb5', dep_krb5.found(), bool_yn: true, section: 'LDAP')
+summary('Krb5 Name', dep_krb5.name(), section: 'LDAP')
+summary('Krb5 Version', dep_krb5.version(), section: 'LDAP')
+
+dep_ldap = declare_dependency(
+  dependencies: [
+    dep_ldap,
+    dep_lber,
+    dep_krb5,
+  ],
+)