mirror of
https://github.com/samba-team/samba.git
synced 2025-01-14 19:24:43 +03:00
s3-waf: move the KRB5_DEPRECATED configure check out of lib/replace
this needs to be in souce3/, as otherwise it can't handle an in-tree kerberos library Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
5debcb1027
commit
e1f2442096
@ -280,14 +280,6 @@ def configure(conf):
|
||||
define = 'REPLACE_STRPTIME',
|
||||
)
|
||||
|
||||
if conf.CONFIG_SET('HAVE_KRB5_H'):
|
||||
# Check for KRB5_DEPRECATED handling
|
||||
conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
|
||||
#include <krb5.h>''',
|
||||
'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
|
||||
link=False,
|
||||
msg="Checking for KRB5_DEPRECATED define taking an identifier")
|
||||
|
||||
conf.CHECK_CODE('gettimeofday(NULL, NULL)', 'HAVE_GETTIMEOFDAY_TZ', execute=False)
|
||||
|
||||
conf.CHECK_CODE('#include "test/snprintf.c"',
|
||||
|
@ -759,6 +759,12 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
|
||||
headers='krb5.h', lib='krb5', execute=True,
|
||||
msg="Checking whether the WRFILE:-keytab is supported");
|
||||
|
||||
# Check for KRB5_DEPRECATED handling
|
||||
conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
|
||||
#include <krb5.h>''',
|
||||
'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
|
||||
link=False,
|
||||
msg="Checking for KRB5_DEPRECATED define taking an identifier")
|
||||
else:
|
||||
conf.SET_TARGET_TYPE('krb5', 'EMPTY')
|
||||
conf.SET_TARGET_TYPE('gssapi', 'EMPTY')
|
||||
|
Loading…
x
Reference in New Issue
Block a user