git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s4:rpc_server/lsa: pass the correct variable to setInfoTrustedDomain_base()
[obnox/samba/samba-obnox.git]
/
wscript_configure_system_mitkrb5
diff --git
a/wscript_configure_system_mitkrb5
b/wscript_configure_system_mitkrb5
index 31ed7f7af19ce6c705a6c814262c6a34e3a338cd..ce49ab7518ff640b0ff5fc17d47214a0002eb7d7 100644
(file)
--- a/
wscript_configure_system_mitkrb5
+++ b/
wscript_configure_system_mitkrb5
@@
-28,6
+28,10
@@
if conf.env.KRB5_CONFIG:
conf.check_cfg(path=conf.env.KRB5_CONFIG, args="--cflags --libs",
package="gssapi", uselib_store="GSSAPI")
krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI'])
conf.check_cfg(path=conf.env.KRB5_CONFIG, args="--cflags --libs",
package="gssapi", uselib_store="GSSAPI")
krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI'])
+ if 'k5crypto' in conf.env['LIB_GSSAPI']:
+ krb5_define_syslib(conf, "k5crypto", conf.env['LIB_GSSAPI'])
+ if 'com_err' in conf.env['LIB_GSSAPI']:
+ krb5_define_syslib(conf, "com_err", conf.env['LIB_GSSAPI'])
if 'gssapi_krb5' in conf.env['LIB_GSSAPI']:
krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI'])
if 'gssapi_krb5' in conf.env['LIB_GSSAPI']:
krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI'])
@@
-62,6
+66,8
@@
conf.CHECK_FUNCS_IN('des_set_key','crypto')
conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
+conf.CHECK_HEADERS('profile.h')
+
if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5'):
have_gssapi=True
if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5'):
have_gssapi=True
@@
-103,7
+109,12
@@
conf.CHECK_FUNCS('''
krb5_get_init_creds_keyblock krb5_get_init_creds_keytab
krb5_make_principal krb5_build_principal_alloc_va
krb5_cc_get_lifetime krb5_cc_retrieve_cred
krb5_get_init_creds_keyblock krb5_get_init_creds_keytab
krb5_make_principal krb5_build_principal_alloc_va
krb5_cc_get_lifetime krb5_cc_retrieve_cred
- krb5_free_checksum_contents krb5_c_make_checksum krb5_create_checksum''',
+ krb5_free_checksum_contents krb5_c_make_checksum krb5_create_checksum
+ krb5_config_get_bool_default krb5_get_profile
+ krb5_data_copy
+ krb5_keyblock_init krb5_principal_set_realm krb5_principal_get_type
+ krb5_warnx
+ ''',
lib='krb5 k5crypto')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
krb5_auth_con_set_req_cksumtype''',
lib='krb5 k5crypto')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
krb5_auth_con_set_req_cksumtype''',
@@
-154,7
+165,7
@@
conf.CHECK_CODE('''
}''',
'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG',
headers='krb5.h', lib='krb5 k5crypto',
}''',
'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG',
headers='krb5.h', lib='krb5 k5crypto',
- addmain=False, cflags=
'-Werror'
,
+ addmain=False, cflags=
conf.env['WERROR_CFLAGS']
,
msg="Checking whether krb5_enctype_to_string takes size_t argument")
conf.CHECK_CODE('''
msg="Checking whether krb5_enctype_to_string takes size_t argument")
conf.CHECK_CODE('''
@@
-167,7
+178,7
@@
conf.CHECK_CODE('''
}''',
'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG',
headers='krb5.h stdlib.h', lib='krb5',
}''',
'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG',
headers='krb5.h stdlib.h', lib='krb5',
- addmain=False, cflags=
'-Werror'
,
+ addmain=False, cflags=
conf.env['WERROR_CFLAGS']
,
msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
conf.CHECK_CODE('''
int main(void) {
msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
conf.CHECK_CODE('''
int main(void) {