From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 24 Jan 2025 15:28:05 +0000 (+0100)
Subject: Simplify logic, prompted by @Habbie
X-Git-Tag: dnsdist-2.0.0-alpha1~139^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15086%2Fhead;p=thirdparty%2Fpdns.git

Simplify logic, prompted by @Habbie
---

diff --git a/meson/ldap/meson.build b/meson/ldap/meson.build
index 4a02110fb1..fd2965d6db 100644
--- a/meson/ldap/meson.build
+++ b/meson/ldap/meson.build
@@ -6,24 +6,12 @@ if get_option('module-ldap') != 'disabled'
   dep_krb5_internal = dependency('krb5', required: true)
 
   if not dep_ldap_internal.found()
-    lib_ldap_internal = cxx.find_library('ldap', disabler: true, required: false)
-    if lib_ldap_internal.found()
-      if cxx.links(prog, name: '-lldap is needed', dependencies: lib_ldap_internal)
-        dep_ldap_internal = declare_dependency(dependencies: lib_ldap_internal)
-      endif
-    endif
+    lib_ldap_internal = cxx.find_library('ldap', disabler: true, required: true)
+    dep_ldap_internal = declare_dependency(dependencies: lib_ldap_internal)
   endif
   if not dep_lber_internal.found()
-    lib_lber_internal = cxx.find_library('lber', disabler: true, required: false)
-    if lib_lber_internal.found()
-      if cxx.links(prog, name: '-lber is needed', dependencies: lib_lber_internal)
-        dep_lber_internal = declare_dependency(dependencies: lib_lber_internal)
-      endif
-    endif
-  endif
-
-  if not dep_ldap_internal.found()
-    error('module-ldap enabled but libldap not found')
+    lib_lber_internal = cxx.find_library('lber', disabler: true, required: true)
+    dep_lber_internal = declare_dependency(dependencies: lib_lber_internal)
   endif
 
   conf.set('HAVE_LIBLDAP', dep_ldap_internal.found(), description: 'Have libldap')