From c85008e0843f5b2af0a83ed0748af46873515446 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 12 Apr 2010 00:40:54 -0600 Subject: [PATCH] s3-waf: move the KRB5_DEPRECATED check into lib/replace this needs to be with the krb5.h check --- lib/replace/wscript | 2 +- source3/wscript | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index ff41ce67c43..4bafcadbd40 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -35,7 +35,7 @@ def configure(conf): conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h') conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') - conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h langinfo.h') + conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') conf.CHECK_HEADERS('shadow.h sys/acl.h') conf.CHECK_HEADERS('sys/attributes.h sys/capability.h sys/dir.h sys/epoll.h') diff --git a/source3/wscript b/source3/wscript index c3652fd48d7..2275f88f1d1 100644 --- a/source3/wscript +++ b/source3/wscript @@ -352,13 +352,6 @@ updwtmp updwtmpx utimensat vsyslog _write __write __xstat if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so' - # Check for KRB5_DEPRECATED handling - conf.CHECK_CODE('''#define KRB5_DEPRECATED 1 -#include ''', - 'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False, - link=False, - msg="Checking for KRB5_DEPRECATED define taking an identifier") - conf.CHECK_FUNCS_IN('_et_list', 'com_err') conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto') conf.CHECK_FUNCS_IN('crypto', 'des_set_key') -- 2.11.4.GIT