]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Simplify logic, prompted by @Habbie 15086/head
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 24 Jan 2025 15:28:05 +0000 (16:28 +0100)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 24 Jan 2025 15:28:05 +0000 (16:28 +0100)
meson/ldap/meson.build

index 4a02110fb1b0f169baffc7d51763f2d251074a3a..fd2965d6db09a85e04c153da4b7c2ef30519b57d 100644 (file)
@@ -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')