summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-03-18 15:19:25 +0100
committerGünther Deschner <gd@samba.org>2011-03-19 00:11:18 +0100
commit33b8d0a6ff51800bfadf47286584b0895b6b3e65 (patch)
treeacb0104b7dc544860ed1f740d9416fa406668ba5 /source3
parentc53e7f8d58c9a38aad3890df7f54da8996a95ce4 (diff)
downloadsamba-33b8d0a6ff51800bfadf47286584b0895b6b3e65.tar.gz
samba-33b8d0a6ff51800bfadf47286584b0895b6b3e65.tar.bz2
samba-33b8d0a6ff51800bfadf47286584b0895b6b3e65.zip
s3-waf: use HAVE_ADS env to decide whether to build libads.so
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript2
-rwxr-xr-xsource3/wscript_build5
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript
index c9ee92817a..9fcf173065 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -910,6 +910,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
conf.DEFINE('HAVE_KRB5', '1')
if have_gssapi:
conf.DEFINE('HAVE_GSSAPI', '1')
+ if conf.CONFIG_SET('HAVE_LDAP'):
+ conf.env['HAVE_ADS'] = '1'
else:
Logs.warn("krb5 libs don't have all features required for Active Directory support")
conf.undefine('HAVE_KRB5_H')
diff --git a/source3/wscript_build b/source3/wscript_build
index dbfb465bed..e02593d654 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -819,9 +819,10 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
bld.SAMBA3_LIBRARY('ads',
source=LIBADS_SRC,
- deps='LIBCLI_LDAP_NDR krb5',
+ deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber',
private_library=True,
- vars=locals())
+ vars=locals(),
+ enabled=bld.env.HAVE_ADS)
bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,