summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-04-24 19:37:13 +0300
committerAlexander Bokovoy <ab@samba.org>2012-04-25 00:18:32 +0200
commit594e3161810ba5a57ce5a3c88a8cd89b11d04650 (patch)
tree85f2a84c3ff5260722027db8fa940d30e5de5f2d /buildtools/wafsamba
parent2d01099acc77d433f06f36f854f27fd9f1e43f05 (diff)
downloadsamba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.tar.gz
samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.tar.bz2
samba-594e3161810ba5a57ce5a3c88a8cd89b11d04650.zip
lib/replace: split out GSSAPI from lib/replace/system/kerberos.h into lib/replace/system/gssapi.h
With waf build include directories are defined by dependencies specified to subsystems. Without proper dependency <gssapi/gssapi.h> cannot be found for embedded Heimdal builds when there are no system-wide gssapi/gssapi.h available. Split out GSSAPI header includes in a separate replacement header and use that explicitly where needed. Autobuild-User: Alexander Bokovoy <ab@samba.org> Autobuild-Date: Wed Apr 25 00:18:33 CEST 2012 on sn-devel-104
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/samba3.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 369285c395..7f05ffe40d 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -56,8 +56,10 @@ def s3_fix_kwargs(bld, kwargs):
# local heimdal paths only included when USING_SYSTEM_KRB5 is not set
if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
extra_includes += [ '../source4/heimdal/lib/com_err',
+ '../source4/heimdal/lib/krb5',
'../source4/heimdal/lib/gssapi',
- '../source4/heimdal_build' ]
+ '../source4/heimdal_build',
+ '../bin/default/source4/heimdal/lib/asn1' ]
if bld.CONFIG_SET('BUILD_TDB2'):
if bld.CONFIG_SET('USING_SYSTEM_TDB2'):