[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-257-g9fa2e56

[Stefan Metzmacher]

The branch, master has been updated
       via  9fa2e564886525dd82b3283da2c467bc8d576225 (commit)
       via  c28952c55505ce09e3cc082ad59692d4977ed26e (commit)
       via  24a1b556fc0296c289a0a83fafc7815fff528cfb (commit)
      from  e592718c43d14ddb1f97be3a10d02b6a8deaa269 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9fa2e564886525dd82b3283da2c467bc8d576225
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 18:41:34 2009 +0100

    s4:heimdal_build: add a dummy define for dirfd()
    
    metze

commit c28952c55505ce09e3cc082ad59692d4977ed26e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 18:38:00 2009 +0100

    lib/replace: check if we have dirfd()
    
    Note: we only use this internally and don't replace it by default.
    
    metze

commit 24a1b556fc0296c289a0a83fafc7815fff528cfb
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 30 18:41:07 2009 +0100

    s4:lib/util: fix the build
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/repdir.m4          |    3 +++
 lib/util/config.mk             |    2 +-
 source4/heimdal_build/config.h |    4 ++++
 3 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/repdir.m4 b/lib/replace/repdir.m4
index f53a4c2..fb3f414 100644
--- a/lib/replace/repdir.m4
+++ b/lib/replace/repdir.m4
@@ -7,6 +7,9 @@ AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
 	[libreplace_cv_READDIR_NEEDED="assuming not"])
 ])
 
+AC_CHECK_FUNCS(dirfd)
+AC_HAVE_DECL(dirfd, [#include <dirent.h>])
+
 #
 # try to replace with getdirentries() if needed
 #
diff --git a/lib/util/config.mk b/lib/util/config.mk
index 02f476b..14bdb2a 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -30,7 +30,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
 		params.o)
 
 PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
-				 dlinklist.h
+				 dlinklist.h \
 				 attr.h \
 				 byteorder.h \
 				 data_blob.h \
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 5f21da2..114e536 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -10,6 +10,10 @@
 #include "../replace/replace.h"
 #include "system/network.h"
 
+#if !defined(HAVE_DIRFD) && !defined(HAVE_DIRFD_DECL) && !defined(dirfd)
+#define dirfd(d) (-1)
+#endif
+
 #define RCSID(msg) struct __rcsid { int __rcsdi; }
 #define KRB5
 


-- 
Samba Shared Repository