X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=f69b5d9c2bd274c37326985cf486c0a6e4035c05;hb=307b5ac2b6178047bff4af5f9cf35d5dbc99d6f8;hp=f28f8bef37648fd32061f403bf21ccacce2223c0;hpb=35c0c60947856db7a9ac3a7d2cb2f6ae434a2b80;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index f28f8bef3..f69b5d9c2 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,27 +1,27 @@
-#serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 18
+dnl Copyright (C) 2005-2011 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.
 
 AC_DEFUN([gl_FUNC_FTS],
 [
-  AC_LIBSOURCES([fts.c, fts_.h])
+  gl_FUNC_FTS_CORE
+])
 
+AC_DEFUN([gl_FUNC_FTS_CORE],
+[
   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([AC_C_INLINE])
+  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_FUNCS_ONCE([fstatfs])
+  AC_CHECK_HEADERS_ONCE([sys/param.h sys/vfs.h])dnl
+  AC_CHECK_MEMBERS([struct statfs.f_type],,,
+    [$ac_includes_default
+     #include <sys/vfs.h>])
 ])