From: Andres Freund <andres@anarazel.de>
Date: Mon, 3 Oct 2022 17:13:12 +0000 (-0700)
Subject: meson: respect -Dldap=disabled
X-Git-Tag: REL_16_BETA1~1552
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ae5db28d06939d1a2ac52813629be0dfc77010e;p=thirdparty%2Fpostgresql.git

meson: respect -Dldap=disabled

I noticed during some manual testing that -Dldap=disabled (or
--auto-features=disabled) doesn't disable ldap if available - that's obviously
wrong.
---

diff --git a/meson.build b/meson.build
index 7bf798674ce..253994931e8 100644
--- a/meson.build
+++ b/meson.build
@@ -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