build: Only use embedded Heimdal include paths in an embedded Heimdal build

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14924

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>

diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index ebc7fbb707f000f51ded6217a9cea8e07ba65ad5..4277c5f6f2eacb4237749ad3fa52f6bdf20401c8 100644 (file)
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -35,8 +35,8 @@ def s3_fix_kwargs(bld, kwargs):
 
     # the extra_includes list is relative to the source3 directory
     extra_includes = [ '.', 'include', 'lib' ]
-    # local heimdal paths only included when USING_SYSTEM_KRB5 is not set
-    if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
+    # local heimdal paths must only be included when using our embedded Heimdal
+    if bld.CONFIG_SET("USING_EMBEDDED_HEIMDAL"):
         extra_includes += [ '../source4/heimdal/lib/com_err',
                             '../source4/heimdal/lib/krb5',
                             '../source4/heimdal/lib/gssapi',