summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-28 22:24:15 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:14 +1000
commit5d84194644c25055bd2535e336995492f6b68228 (patch)
tree0ece24369acb81ee77714675d859ab7417f9a70c
parentb7ff06b904f8983d49d4a37c1e86a342e55790f6 (diff)
downloadsamba-5d84194644c25055bd2535e336995492f6b68228.tar.gz
samba-5d84194644c25055bd2535e336995492f6b68228.tar.bz2
samba-5d84194644c25055bd2535e336995492f6b68228.zip
s4-waf: heimdal wants to look for dd_fd in DIR
-rw-r--r--lib/replace/wscript2
-rw-r--r--source4/heimdal_build/wscript_configure4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index e2baa02b00..afb0a01903 100644
--- 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 a887636803..8d39561e77 100644
--- 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)