diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-11 12:07:39 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-11 12:22:41 +0100 |
| commit | 1bad50f648fff0a145d56bf3094c14b6e0845fa2 (patch) | |
| tree | 9c02ada036d0fbca766e210adef05ebdc032dc8d /source3 | |
| parent | d08ddf08a8f008909e3cf4ff1c1933566f1ec275 (diff) | |
| download | samba-1bad50f648fff0a145d56bf3094c14b6e0845fa2.tar.gz samba-1bad50f648fff0a145d56bf3094c14b6e0845fa2.tar.bz2 samba-1bad50f648fff0a145d56bf3094c14b6e0845fa2.zip | |
s3-waf: rework the way SMBLDAP subsystem is built a little.
Guenther
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/wscript | 3 | ||||
| -rw-r--r-- | source3/wscript_build | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/wscript b/source3/wscript index cbc7cd325d..3957fcab55 100644 --- a/source3/wscript +++ b/source3/wscript @@ -572,8 +572,7 @@ msg.msg_acctrightslen = sizeof(fd); if conf.CONFIG_SET('HAVE_LDAP_INIT'): conf.DEFINE('HAVE_LDAP', '1') conf.DEFINE('LDAP_DEPRECATED', '1') - conf.env['SMBLDAP'] = 'lib/smbldap.c' - conf.env['SMBLDAPUTIL'] = 'lib/smbldap_util.c' + conf.env['HAVE_LDAP'] = '1' else: conf.SET_TARGET_TYPE('ldap', 'EMPTY') conf.SET_TARGET_TYPE('lber', 'EMPTY') diff --git a/source3/wscript_build b/source3/wscript_build index cb5cdcbf45..a201979ba8 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -11,10 +11,7 @@ TDB_LIB_SRC = ''' TDB_VALIDATE_SRC = '''lib/tdb_validate.c''' -SMBLDAP = bld.env.SMBLDAP or "" -SMBLDAPUTIL = bld.env.SMBLDAPUTIL or "" - -SMBLDAP_SRC = '''${SMBLDAP} ${SMBLDAPUTIL}''' +SMBLDAP_SRC = '''lib/smbldap.c lib/smbldap_util.c''' VERSION_SRC = '''lib/version.c''' @@ -880,7 +877,8 @@ bld.SAMBA_SUBSYSTEM('SECRETS', bld.SAMBA_SUBSYSTEM('SMBLDAP', source=SMBLDAP_SRC, deps='ldap lber', - vars=locals()) + vars=locals(), + enabled=bld.env.HAVE_LDAP) bld.SAMBA_SUBSYSTEM('LIBADS', source=LIBADS_SRC, |