From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 15 Feb 2011 05:31:35 +0000 (+1100)
Subject: s3-waf: move the KRB5_DEPRECATED configure check out of lib/replace
X-Git-Tag: tevent-0.9.11~562
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1f2442096e626b49e63838b28698965eef52518;p=thirdparty%2Fsamba.git

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>
---

diff --git a/lib/replace/wscript b/lib/replace/wscript
index b9921c9b9cc..b1aad69fb76 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 c87fb456ae1..4938f165f25 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')