diff options
| author | Stefan Metzmacher <metze@samba.org> | 2020-04-02 07:31:33 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-06-15 22:41:34 +0000 |
| commit | d62917d3d7eeb9c5782d7230a4012b5a9235154f (patch) | |
| tree | b51f7432a8edc2fb820d52b12ff1fe25c7ad4c7a | |
| parent | 7b4aef782cdc8d801b91a2538a942a4e5bab4f94 (diff) | |
| download | samba-d62917d3d7eeb9c5782d7230a4012b5a9235154f.tar.gz | |
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>
| -rw-r--r-- | wscript_configure_embedded_heimdal | 1 | ||||
| -rw-r--r-- | wscript_configure_system_heimdal | 2 | ||||
| -rw-r--r-- | wscript_configure_system_mitkrb5 | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal index 81cfd856c59..1c7801f705e 100644 --- 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 235fa1912b7..67d8804d0ff 100644 --- 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 b0bf2a8b40d..f971194c2cd 100644 --- 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') |