s4-waf: heimdal wants to look for dd_fd in DIR

diff --git a/lib/replace/wscript b/lib/replace/wscript
index e2baa02b0050159b2c9e34c4011ac8b7e9887043..afb0a01903a2559cfa1469bb37169b95eac28e6f 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -146,8 +146,6 @@ def configure(conf):
 
     conf.CHECK_DECLS('snprintf vsnprintf asprintf vasprintf')
 
-    conf.CHECK_FUNCS('dirfd', headers='dirent.h')
-    conf.CHECK_DECLS('dirfd', reverse=True, headers='dirent.h')
     conf.CHECK_DECLS('errno', headers='errno.h', reverse=True)
     conf.CHECK_DECLS('environ getgrent_r getpwent_r', reverse=True, headers='pwd.h grp.h')
     conf.CHECK_DECLS('pread pwrite setenv setresgid setresuid', reverse=True)

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index a887636803a5e3e24f4d5ca2ad7fb71c855d12d4..8d39561e77ad6c6ff8e7ad47c30cf0646c6c5b2f 100644 (file)
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -52,4 +52,8 @@ conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h lib
 conf.DEFINE('HAVE_KRB5',1)
 conf.DEFINE('HAVE_GSSAPI',1)
 
+conf.CHECK_FUNCS('dirfd', headers='dirent.h')
+conf.CHECK_DECLS('dirfd', reverse=True, headers='dirent.h')
+conf.CHECK_STRUCTURE_MEMBER('DIR', 'dd_fd', define='HAVE_DIR_DD_FD',  headers='dirent.h')
+
 conf.DEFINE('SAMBA4_INTERNAL_HEIMDAL', 1)