From: Günther Deschner <gd@samba.org>
Date: Mon, 17 Oct 2011 15:19:27 +0000 (+0200)
Subject: s3-waf: create a smbldap.so library.
X-Git-Tag: ldb-1.1.4~267
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=693781db8962a39af376e5d5df0d36e1f3ad127b;p=thirdparty%2Fsamba.git

s3-waf: create a smbldap.so library.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Nov 16 14:03:05 CET 2011 on sn-devel-104
---

diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 633d9b74acb..70b21d56b2e 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -6,7 +6,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
                   pam_smb_passwd.c
                   pam_smb_acct.c
                   support.c''',
-        deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param pdb SMBLDAP
+        deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param pdb
                 LIBNTLMSSP LIBTSOCKET''',
         cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
         realname='pam_smbpass.so',
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index bbc37221685..dbf9707c6f2 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -16,6 +16,7 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
 
 bld.SAMBA3_MODULE('pdb_ldap',
                  subsystem='pdb',
+                 deps='smbldap',
                  source=PDB_LDAP_SRC,
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index d59cececf8d..071069b5357 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -73,6 +73,7 @@ bld.SAMBA3_MODULE('idmap_passdb',
 bld.SAMBA3_MODULE('idmap_ldap',
                  subsystem='idmap',
                  source=IDMAP_LDAP_SRC,
+                 deps='smbldap',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.env.HAVE_LDAP)
diff --git a/source3/wscript_build b/source3/wscript_build
index d91bcffd1f4..99d40406d7a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -714,7 +714,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
 
 bld.SAMBA3_LIBRARY('pdb',
                    source=PASSDB_SRC,
-                   deps='SECRETS3 SMBLDAP GROUPDB wbclient LIBCLI_AUTH flag_mapping',
+                   deps='SECRETS3 GROUPDB wbclient LIBCLI_AUTH flag_mapping',
                    private_library=True,
                    public_headers='''
 				include/passdb.h
@@ -837,15 +837,17 @@ bld.SAMBA3_SUBSYSTEM('SECRETS3',
                    deps='NDR_SECRETS param samba3core pdb',
                    vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('SMBLDAP',
+bld.SAMBA3_LIBRARY('smbldap',
                     source=SMBLDAP_SRC,
-                    deps='ldap lber',
+                    deps='ldap lber samba-util param',
                     vars=locals(),
-                    enabled=bld.env.HAVE_LDAP)
+                    enabled=bld.env.HAVE_LDAP,
+                    private_library=True,
+                    public_headers='include/smbldap.h include/smb_ldap.h')
 
 bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
-                   deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL',
+                   deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
                    private_library=True,
                    vars=locals())