X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=2c9348e637e0ae666ffc5efa1727619048f9e3be;hb=ad7e0cc967251bc0d09999503a51e5fbcfac021d;hp=94f5e84f7e403e097892d0190056b4aa0e64eb79;hpb=c2546905a0f3958439581290d150c9ae4ae52a50;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index 94f5e84f7..2c9348e63 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,5 +1,5 @@
-#serial 4
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 11
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_FTS],
 [
   AC_REQUIRE([gl_FUNC_FTS_CORE])
-  AC_LIBSOURCES([fts-cycle.c])
 ])
 
 AC_DEFUN([gl_FUNC_FTS_LGPL],
@@ -20,22 +19,13 @@ AC_DEFUN([gl_FUNC_FTS_LGPL],
 
 AC_DEFUN([gl_FUNC_FTS_CORE],
 [
-  AC_LIBSOURCES([fts.c, fts_.h])
-
   dnl Use this version of fts unconditionally, since the GNU libc and
   dnl NetBSD versions have bugs and/or unnecessary limitations.
   AC_LIBOBJ([fts])
 
   dnl Prerequisites of lib/fts.c.
+  AC_REQUIRE([gl_FUNC_OPENAT])
 
   # Checks for header files.
-  AC_REQUIRE([AC_HEADER_DIRENT])
-  AC_CHECK_HEADERS_ONCE([inttypes.h stdint.h])
-  AC_CHECK_HEADERS_ONCE([sys/param.h])
-
-  # Checks for typedefs, structures, and compiler characteristics.
-  AC_REQUIRE([gt_INTTYPES_PRI])
-
-  # Checks for library functions.
-  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+  AC_CHECK_HEADERS_ONCE([sys/param.h])dnl
 ])