Fix AODN & LDAP build