svn commit: samba r18451 - in branches/SAMBA_4_0/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2006-09-13 09:56:21 +0000 (Wed, 13 Sep 2006)
New Revision: 18451

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18451

Log:
move repdir/ into the top dir

metze
Added:
   branches/SAMBA_4_0/source/lib/replace/repdir.m4
   branches/SAMBA_4_0/source/lib/replace/repdir_getdents.c
Removed:
   branches/SAMBA_4_0/source/lib/replace/repdir/
Modified:
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-13 09:47:41 UTC (rev 18450)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-13 09:56:21 UTC (rev 18451)
@@ -342,7 +342,7 @@
 m4_include(getpass.m4)
 m4_include(system/config.m4)
 m4_include(win32/config.m4)
-m4_include(repdir/config.m4)
+m4_include(repdir.m4)
 
 AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
 			   [AC_MSG_ERROR([Required function not found])])

Copied: branches/SAMBA_4_0/source/lib/replace/repdir.m4 (from rev 18450, branches/SAMBA_4_0/source/lib/replace/repdir/config.m4)
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/repdir/config.m4	2006-09-13 09:47:41 UTC (rev 18450)
+++ branches/SAMBA_4_0/source/lib/replace/repdir.m4	2006-09-13 09:56:21 UTC (rev 18451)
@@ -0,0 +1,30 @@
+AC_CACHE_CHECK([for broken readdir],libreplace_READDIR_NEEDED,[
+	AC_TRY_RUN([
+#define test_readdir_os2_delete main
+#error
+#include "$libreplacedir/test/os2_delete.c"],
+	[libreplace_READDIR_NEEDED=no],
+	[libreplace_READDIR_NEEDED=yes],
+	[libreplace_READDIR_NEEDED="assuming not"])
+])
+
+#
+# try to replace with getdents() if needed
+#
+if test x"$libreplace_READDIR_NEEDED" = x"yes"; then
+AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_READDIR_GETDENTS,[
+	AC_TRY_RUN([
+#include "confdefs.h"
+#include "$libreplacedir/repdir_getdents.c"
+#define test_readdir_os2_delete main
+#include "$libreplacedir/test/os2_delete.c"],
+	[libreplace_READDIR_GETDENTS=yes],
+	[libreplace_READDIR_GETDENTS=no])
+])
+fi
+if test x"$libreplace_READDIR_GETDENTS" = x"yes"; then
+	AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
+	AC_DEFINE(REPLACE_READDIR_GETDENTS,1,[replace readdir using getdents()])
+	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
+	libreplace_READDIR_NEEDED=no
+fi

Copied: branches/SAMBA_4_0/source/lib/replace/repdir_getdents.c (from rev 18420, branches/SAMBA_4_0/source/lib/replace/repdir/repdir.c)