summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2013-02-06 10:43:16 +0200
committerAlexander Bokovoy <ab@samba.org>2013-02-06 11:51:11 +0100
commite721e7132e7bb32850ff8b2af654b8f3ebf955fe (patch)
tree821e92da025a5f2fc15f4460aa450baf20525dd5
parent1b582c4bf8ad46034eb30c758b085dc210e8096a (diff)
downloadsamba-e721e7132e7bb32850ff8b2af654b8f3ebf955fe.tar.gz
samba-e721e7132e7bb32850ff8b2af654b8f3ebf955fe.tar.bz2
samba-e721e7132e7bb32850ff8b2af654b8f3ebf955fe.zip
source3/wscript: support 'pdb_ldap' module in configure
While PASSDB module ldapsam is called pdb_ldapsam internally, support specifying 'pdb_ldap' during configure step. This should make transition to pdb_ldapsam transparent to distributions. Reviewed-by: Andreas Schneider <asn@samba.org>
-rw-r--r--source3/wscript13
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/wscript b/source3/wscript
index d223316a3b..84abf76a3d 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1741,6 +1741,19 @@ main() {
explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
+ def replace_list_item(lst, item, value):
+ try:
+ idx = lst.index(item)
+ lst[idx] = value
+ except:
+ pass
+ # PDB module file name should have the same name as module registers itself
+ # In Autoconf build we export LDAP passdb module as ldapsam but WAF build
+ # was always exporting pdb_ldap. In order to support existing packages
+ # allow referring to pdb_ldapsam as pdb_ldap but use proper name internally.
+ replace_list_item(explicit_shared_modules, 'pdb_ldap', 'pdb_ldapsam')
+ replace_list_item(explicit_static_modules, 'pdb_ldap', 'pdb_ldapsam')
+
final_static_modules = default_static_modules
final_shared_modules = default_shared_modules