meson: respect -Dldap=disabled
authorAndres Freund <[email protected]>
Mon, 3 Oct 2022 17:13:12 +0000 (10:13 -0700)
committerAndres Freund <[email protected]>
Mon, 3 Oct 2022 17:13:12 +0000 (10:13 -0700)
I noticed during some manual testing that -Dldap=disabled (or
--auto-features=disabled) doesn't disable ldap if available - that's obviously
wrong.

meson.build

index 7bf798674ce742fe31f5cc5047f726a11b98da67..253994931e8a1a4cf38dd89292d1b699a78f60f0 100644 (file)
@@ -584,7 +584,10 @@ endif
 ###############################################################
 
 ldapopt = get_option('ldap')
-if host_system == 'windows'
+if ldapopt.disabled()
+  ldap = not_found_dep
+  ldap_r = not_found_dep
+elif host_system == 'windows'
   ldap = cc.find_library('wldap32', required: ldapopt)
   ldap_r = ldap
 else