waf: Fix pdb_ldap which cannot be built as a module.
authorAndreas Schneider <asn@samba.org>
Tue, 22 Jan 2013 08:55:02 +0000 (09:55 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 23 Jan 2013 09:51:59 +0000 (10:51 +0100)
The module has two init functions, pdb_ldap_init() and
pdb_ldapsam_init(). As a shared module only one can be found until we
create a symlink.

Reviewed-by: Günther Deschner <gd@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Jan 23 10:51:59 CET 2013 on sn-devel-104

source3/passdb/wscript_build

index 03a0df4174bf3896c8ccd87476962a176a803b7f..03c8b56f7e6575e24fa5d2de20d7c70379e4d174 100644 (file)
@@ -13,13 +13,15 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
 
+# This cannot be built as a shared module cause it has two init functions. The
+# code needs to be cleaned up and split to allow this.
 bld.SAMBA3_MODULE('pdb_ldap',
                  subsystem='pdb',
                  deps='smbldap smbldaphelper',
                  source=PDB_LDAP_SRC,
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.CONFIG_SET('HAVE_LDAP'))
+                 internal_module=True,
+                 enabled=bld.CONFIG_SET('HAVE_LDAP'))
 
 bld.SAMBA3_MODULE('pdb_smbpasswd',
                  subsystem='pdb',