nwrap: catch NULL list in nwrap_add_hname_add_to_existing

[kai/samba-autobuild/.git] / wscript_configure_system_mitkrb5

diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 3cef223a560171603edaeed11e3bd03cc5724fdc..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.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'])
 
-    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'])
+    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'])
 
@@ -50,7 +54,7 @@ if conf.env.KRB5_CONFIG:
         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')
 
@@ -108,7 +112,9 @@ conf.CHECK_FUNCS('''
        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_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
@@ -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')
+conf.CHECK_STRUCTURE_MEMBER('krb5_prompt', 'type', headers='krb5.h',
+                            define='HAVE_KRB5_PROMPT_TYPE')
 
 conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')