From 8c7b0ab9b3ae07574c6b5c5ba5888c3f329c9e02 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 6 Feb 2013 10:43:16 +0200 Subject: [PATCH 2/3] 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 --- source3/wscript | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source3/wscript b/source3/wscript index 34fccb1..194d712 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1745,6 +1745,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 -- 1.8.1.2