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
nwrap: fix a copy and paste error in the destructor.
[obnox/samba/samba-obnox.git]
/
wscript_configure_system_mitkrb5
diff --git
a/wscript_configure_system_mitkrb5
b/wscript_configure_system_mitkrb5
index c3e9e275d58cf1ae003f3277a468a7b9e4f46d92..4b3a69fa34415174404cbdc4f4bd95a90d17d6e4 100644
(file)
--- a/
wscript_configure_system_mitkrb5
+++ b/
wscript_configure_system_mitkrb5
@@
-21,13
+21,17
@@
else:
conf.find_program('krb5-config', path_list=path_krb5_config, var='KRB5_CONFIG')
if conf.env.KRB5_CONFIG:
conf.find_program('krb5-config', path_list=path_krb5_config, var='KRB5_CONFIG')
if conf.env.KRB5_CONFIG:
- conf.
check_cfg
(path=conf.env.KRB5_CONFIG, args="--cflags --libs",
+ conf.
CHECK_CFG
(path=conf.env.KRB5_CONFIG, args="--cflags --libs",
package="", uselib_store="KRB5")
krb5_define_syslib(conf, "krb5", conf.env['LIB_KRB5'])
package="", uselib_store="KRB5")
krb5_define_syslib(conf, "krb5", conf.env['LIB_KRB5'])
- conf.
check_cfg
(path=conf.env.KRB5_CONFIG, args="--cflags --libs",
+ 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'])
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'])
@@
-50,7
+54,7
@@
if conf.env.KRB5_CONFIG:
else:
Logs.info('%s is detected, MIT krb5 build can proceed' % (kversion))
else:
Logs.info('%s is detected, MIT krb5 build can proceed' % (kversion))
-conf.
check_cfg
(args="--cflags --libs", package="com_err", uselib_store="com_err")
+conf.
CHECK_CFG
(args="--cflags --libs", package="com_err", uselib_store="com_err")
conf.CHECK_FUNCS_IN('_et_list', 'com_err')
conf.CHECK_HEADERS('com_err.h', lib='com_err')
conf.CHECK_FUNCS_IN('_et_list', 'com_err')
conf.CHECK_HEADERS('com_err.h', lib='com_err')
@@
-109,6
+113,8
@@
conf.CHECK_FUNCS('''
krb5_config_get_bool_default krb5_get_profile
krb5_data_copy
krb5_keyblock_init krb5_principal_set_realm krb5_principal_get_type
krb5_config_get_bool_default krb5_get_profile
krb5_data_copy
krb5_keyblock_init krb5_principal_set_realm krb5_principal_get_type
+ krb5_principal_set_type
+ krb5_warnx
''',
lib='krb5 k5crypto')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
''',
lib='krb5 k5crypto')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
@@
-131,6
+137,8
@@
conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h',
define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS')
conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS')
conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
+conf.CHECK_STRUCTURE_MEMBER('krb5_prompt', 'type', headers='krb5.h',
+ define='HAVE_KRB5_PROMPT_TYPE')
conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')