Commit0ae5db2

committed

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 obviouslywrong.

1 parentf4c7c41 commit0ae5db2Copy full SHA for 0ae5db2

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,10 @@ endif`
`584`	`584`	`###############################################################`
`585`	`585`
`586`	`586`	`ldapopt=get_option('ldap')`
`587`		`-if host_system=='windows'`
	`587`	`+if ldapopt.disabled()`
	`588`	`+ ldap= not_found_dep`
	`589`	`+ ldap_r= not_found_dep`
	`590`	`+elif host_system=='windows'`
`588`	`591`	`ldap= cc.find_library('wldap32',required: ldapopt)`
`589`	`592`	`ldap_r= ldap`
`590`	`593`	`else`

Comments

(0)