postgres.git / summary / log / commit / refs

commit    0ae5db28d06939d1a2ac52813629be0dfc77010e
Author:   Andres Freund <andres@anarazel.de>
Date:     Mon Oct 03 17:13:12 2022 +0000
First released in: 16.0

    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.


meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 [parent: f4c7c410ee4a]