summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2012-03-30 15:18:16 +0200
committerAndreas Schneider <asn@samba.org>2012-04-12 12:06:41 +0200
commit1fedb0ae88347bf69b87e515bedb8b4b0ef1a2b3 (patch)
tree595ffbd85c04cb4b01d861fec62a89ad2d81d66d
parentd82aab6c709ce840594e6bafe29ae22f358fc7ee (diff)
downloadsamba-1fedb0ae88347bf69b87e515bedb8b4b0ef1a2b3.tar.gz
samba-1fedb0ae88347bf69b87e515bedb8b4b0ef1a2b3.tar.bz2
samba-1fedb0ae88347bf69b87e515bedb8b4b0ef1a2b3.zip
waf: when USING_SYSTEM_KRB5 environment variable is set, dont configure local
heimdal. Guenther Signed-off-by: Andreas Schneider <asn@samba.org>
-rwxr-xr-xwscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/wscript b/wscript
index 6b51a37c85..15e1ce51bf 100755
--- a/wscript
+++ b/wscript
@@ -84,7 +84,8 @@ def configure(conf):
conf.RECURSE('dynconfig')
conf.RECURSE('lib/ldb')
- conf.RECURSE('source4/heimdal_build')
+ if not os.getenv('USING_SYSTEM_KRB5'):
+ conf.RECURSE('source4/heimdal_build')
conf.RECURSE('source4/lib/tls')
conf.RECURSE('source4/ntvfs/sysdep')
conf.RECURSE('lib/util')