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

[metze at samba.org]

Author: metze
Date: 2006-10-02 05:52:42 +0000 (Mon, 02 Oct 2006)
New Revision: 19023

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

Log:
lets see what the build-farm says about trying the
getdirentries() based readdir() replacement first.

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/repdir.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/repdir.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/repdir.m4	2006-10-02 02:39:05 UTC (rev 19022)
+++ branches/SAMBA_4_0/source/lib/replace/repdir.m4	2006-10-02 05:52:42 UTC (rev 19023)
@@ -8,28 +8,6 @@
 ])
 
 #
-# try to replace with getdents() if needed
-#
-if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-AC_CHECK_FUNCS(getdents)
-AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_cv_READDIR_GETDENTS,[
-	AC_TRY_RUN([
-#define _LIBREPLACE_REPLACE_H
-#include "$libreplacedir/repdir_getdents.c"
-#define test_readdir_os2_delete main
-#include "$libreplacedir/test/os2_delete.c"],
-	[libreplace_cv_READDIR_GETDENTS=yes],
-	[libreplace_cv_READDIR_GETDENTS=no])
-])
-fi
-if test x"$libreplace_cv_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_cv_READDIR_NEEDED=no
-fi
-
-#
 # try to replace with getdirentries() if needed
 #
 if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
@@ -68,6 +46,28 @@
 	libreplace_cv_READDIR_NEEDED=no
 fi
 
+#
+# try to replace with getdents() if needed
+#
+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
+AC_CHECK_FUNCS(getdents)
+AC_CACHE_CHECK([for replacing readdir using getdents()],libreplace_cv_READDIR_GETDENTS,[
+	AC_TRY_RUN([
+#define _LIBREPLACE_REPLACE_H
+#include "$libreplacedir/repdir_getdents.c"
+#define test_readdir_os2_delete main
+#include "$libreplacedir/test/os2_delete.c"],
+	[libreplace_cv_READDIR_GETDENTS=yes],
+	[libreplace_cv_READDIR_GETDENTS=no])
+])
+fi
+if test x"$libreplace_cv_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_cv_READDIR_NEEDED=no
+fi
+
 AC_MSG_CHECKING([a usable readdir()])
 if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
 	AC_MSG_RESULT(no)