heimdal_build: Provide C defines showing which Kerberos library is in use

Squashed from patches by Stefan Metzmacher as part of his Heimdal update branch

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
index 81cfd856c59a9ecfceb45c30e81f36deb6b31eee..1c7801f705e9f34bc171453ceab92eaf8f8fb316 100644 (file)
--- a/wscript_configure_embedded_heimdal
+++ b/wscript_configure_embedded_heimdal
@@ -4,4 +4,5 @@ if not conf.env['FLEX']:
 if not conf.env['BISON']:
     conf.fatal("Embedded Heimdal build requires bison but it was not found.  Install bison or use --with-system-mitkrb5 or --with-system-heimdalkrb5")
 
+conf.define('USING_EMBEDDED_HEIMDAL', 1)
 conf.RECURSE('source4/heimdal_build')

diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal
index 235fa1912b7fc1ce56fce2abb7806b87b8eb6a55..67d8804d0ff03754083ce1a8323a4b766e95825a 100644 (file)
--- a/wscript_configure_system_heimdal
+++ b/wscript_configure_system_heimdal
@@ -99,4 +99,6 @@ finally:
 check_system_heimdal_binary("compile_et")
 check_system_heimdal_binary("asn1_compile")
 
+conf.env.KRB5_VENDOR = 'heimdal'
 conf.define('USING_SYSTEM_KRB5', 1)
+conf.define('USING_SYSTEM_HEIMDAL', 1)

diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index b0bf2a8b40db66110a0c4fad3d2fdbc6ef1f65ea..f971194c2cd0437267703f2b68d96c2678945afd 100644 (file)
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -79,6 +79,7 @@ if conf.env.KRB5_CONFIG:
 
     if parse_version(krb5_version) < parse_version('1.18'):
         conf.DEFINE('HAVE_MIT_KRB5_PRE_1_18', 1)
+    conf.define('USING_SYSTEM_MITKRB5', '"%s"' % krb5_version)
 
 conf.CHECK_CFG(args="--cflags --libs", package="com_err", uselib_store="com_err")
 conf.CHECK_FUNCS_IN('_et_list', 'com_err')