diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-12 00:40:54 -0600 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2010-05-20 22:16:13 +0200 |
| commit | c85008e0843f5b2af0a83ed0748af46873515446 (patch) | |
| tree | ada2c3bd66cf30e8307ac43d6b3732351c6a03d5 | |
| parent | ca7226500ce108fb00aed6280992ecbda16b9726 (diff) | |
| download | samba-c85008e0843f5b2af0a83ed0748af46873515446.tar.gz samba-c85008e0843f5b2af0a83ed0748af46873515446.tar.bz2 samba-c85008e0843f5b2af0a83ed0748af46873515446.zip | |
s3-waf: move the KRB5_DEPRECATED check into lib/replace
this needs to be with the krb5.h check
| -rw-r--r-- | lib/replace/wscript | 2 | ||||
| -rw-r--r-- | source3/wscript | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index ff41ce67c4..4bafcadbd4 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 c3652fd48d..2275f88f1d 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 <krb5.h>''', - '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') |