diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-05-07 16:43:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-05-07 18:33:10 +0200 |
| commit | 890485bd17142ac9bbaf71c24d3d3ec1fa4a6724 (patch) | |
| tree | 84ecc0c82888e67850b2f6f9c453ea7c7cb9eab1 /source4/heimdal_build | |
| parent | 4754743860b4601465aa122021a8ae7ddb42f6a1 (diff) | |
| download | samba-890485bd17142ac9bbaf71c24d3d3ec1fa4a6724.tar.gz samba-890485bd17142ac9bbaf71c24d3d3ec1fa4a6724.tar.bz2 samba-890485bd17142ac9bbaf71c24d3d3ec1fa4a6724.zip | |
heimdal: Cope with newer Heimdal versions accepting a keyset argument to
hdb_enctype2key.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon May 7 18:33:10 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4/heimdal_build')
| -rwxr-xr-x | source4/heimdal_build/wscript_configure | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index a350a8bae9..619944d1d4 100755 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -213,15 +213,33 @@ check_system_heimdal_lib("gssapi", "gss_oid_to_name", "gssapi.h", onlyif="hcrypto asn1 roken krb5 com_err wind") check_system_heimdal_lib("heimntlm", "heim_ntlm_ntlmv2_key", "heimntlm.h", onlyif="roken hcrypto krb5") -check_system_heimdal_lib("hdb", "hdb_db_dir", "krb5.h hdb.h", - onlyif="roken krb5 hcrypto com_err wind") +if check_system_heimdal_lib("hdb", "hdb_db_dir", "krb5.h hdb.h", + onlyif="roken krb5 hcrypto com_err wind"): + CCDEFINES = list(conf.env.CCDEFINES) + conf.undefine("HAVE_CONFIG_H") + while "HAVE_CONFIG_H=1" in conf.env.CCDEFINES: + conf.env.CCDEFINES.remove("HAVE_CONFIG_H=1") + try: + conf.CHECK_CODE(''' + #include <hdb.h> + int main(void) { hdb_enctype2key(NULL, NULL, NULL, 0, NULL); } + ''', + define='HDB_ENCTYPE2KEY_TAKES_KEYSET', + addmain=False, + lib='hdb', + msg='Checking whether hdb_enctype2key takes a keyset argument', + local_include=False) + finally: + conf.env.CCDEFINES = CCDEFINES + conf.define("HAVE_CONFIG_H", "1") + check_system_heimdal_lib("kdc", "kdc_log", "kdc.h", onlyif="roken krb5 hdb asn1 heimntlm hcrypto com_err wind heimbase") # With the proper checks in place we should be able to build against the system libtommath. -# conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h') -# conf.define('USING_SYSTEM_TOMMATH', 1) +#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): +# conf.define('USING_SYSTEM_TOMMATH', 1) check_system_heimdal_binary("compile_et") check_system_heimdal_binary("asn1_compile") |