Skip to content

Commit

Permalink
wscript: Fix build with system heimdal
Browse files Browse the repository at this point in the history
Ubuntu has heimdal include files in /usr/include/heimdal. As the
kerberos include files are pulled into many files through indirect
includes, add the discovered include paths to EXTRA_INCLUDES to
always have them available.

Also set USING_SYSTEM_KRB5 when enabling the system heimdal build,
to correctly handle the inclusion of the krb5-types.h file.

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

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
  • Loading branch information
chs committed Nov 13, 2019
1 parent 63f8d77 commit be2d90b
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions wscript_configure_system_heimdal
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if krb5_config:
elif l.startswith("includedir="):
include_path = l.strip()[len("includedir="):]
heimdal_includedirs.append(include_path)
conf.ADD_EXTRA_INCLUDES(include_path)
conf.define('HEIMDAL_KRB5_TYPES_PATH',
include_path + "/krb5-types.h")
finally:
Expand Down Expand Up @@ -97,3 +98,5 @@ finally:

check_system_heimdal_binary("compile_et")
check_system_heimdal_binary("asn1_compile")

conf.define('USING_SYSTEM_KRB5', 1)

0 comments on commit be2d90b

Please sign in to comment.