diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-15 16:31:35 +1100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-17 00:55:56 +0100 |
| commit | e1f2442096e626b49e63838b28698965eef52518 (patch) | |
| tree | 3ae299b0f7f32dcfd62593e54c879715c80d4adf | |
| parent | 5debcb1027aec5e711605d575b210675fce3169a (diff) | |
| download | samba-e1f2442096e626b49e63838b28698965eef52518.tar.gz samba-e1f2442096e626b49e63838b28698965eef52518.tar.bz2 samba-e1f2442096e626b49e63838b28698965eef52518.zip | |
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>
| -rw-r--r-- | lib/replace/wscript | 8 | ||||
| -rw-r--r-- | source3/wscript | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index b9921c9b9c..b1aad69fb7 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -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"', diff --git a/source3/wscript b/source3/wscript index c87fb456ae..4938f165f2 100644 --- a/source3/wscript +++ b/source3/wscript @@ -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') |