diff options
| author | Andres Freund <andres@anarazel.de> | 2022-10-03 10:13:12 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-10-03 10:13:12 -0700 |
| commit | 0ae5db28d06939d1a2ac52813629be0dfc77010e (patch) | |
| tree | 8b33cf344b2964c66a529e44fc2741ad47b52a56 | |
| parent | f4c7c410ee4a7baa06f51ebb8d5333c169691dd3 (diff) | |
| download | postgresql-0ae5db28d06939d1a2ac52813629be0dfc77010e.tar.gz postgresql-0ae5db28d06939d1a2ac52813629be0dfc77010e.zip | |
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.
| -rw-r--r-- | meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
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 |