From 594e3161810ba5a57ce5a3c88a8cd89b11d04650 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 24 Apr 2012 19:37:13 +0300 Subject: 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 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 Autobuild-Date: Wed Apr 25 00:18:33 CEST 2012 on sn-devel-104 --- buildtools/wafsamba/samba3.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'buildtools') 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'): -- cgit