From: Christof Schmitt Date: Wed, 30 Oct 2019 20:15:48 +0000 (-0700) Subject: wscript: Fix build with system heimdal X-Git-Tag: talloc-2.3.1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be2d90b60d19eca408b60fe4e1b49f9b418f1b97;p=thirdparty%2Fsamba.git wscript: Fix build with system heimdal 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 Reviewed-by: Andrew Bartlett --- diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal index 0ff6dad2f55..235fa1912b7 100644 --- a/wscript_configure_system_heimdal +++ b/wscript_configure_system_heimdal @@ -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: @@ -97,3 +98,5 @@ finally: check_system_heimdal_binary("compile_et") check_system_heimdal_binary("asn1_compile") + +conf.define('USING_SYSTEM_KRB5', 1)