X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=80acc2cf5856e16cb6cb4d1fc2b906a84a61bbe6;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=e549305a9d15d4105d0e38672d54de04f8f7e6a6;hpb=13824a982b94792b64fcc917b6cdbb384c6344f9;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index e549305a9..80acc2cf5 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,36 +1,22 @@
-#serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 20
+dnl Copyright (C) 2005-2014 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, intprops.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])
+  gl_FUNC_FTS_CORE
+])
 
+AC_DEFUN([gl_FUNC_FTS_CORE],
+[
   dnl Prerequisites of lib/fts.c.
+  gl_FUNC_OPENAT
 
-  # Checks for header files.
-  AC_REQUIRE([AC_HEADER_DIRENT])
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE([fcntl.h inttypes.h stddef.h stdint.h])
-  AC_CHECK_HEADERS_ONCE([stdlib.h string.h sys/param.h unistd.h])
-
-  # Checks for typedefs, structures, and compiler characteristics.
-  AC_REQUIRE([AM_STDBOOL_H])
-  AC_REQUIRE([AC_C_CONST])
-  AC_REQUIRE([AC_TYPE_SIZE_T])
-  AC_REQUIRE([gt_INTTYPES_PRI])
-  AC_CHECK_TYPES([ptrdiff_t])
-
-  # Checks for library functions.
-  AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
-  AC_REQUIRE([AC_FUNC_LSTAT])
-  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
-  AC_REQUIRE([AC_FUNC_STAT])
-  AC_CHECK_FUNCS_ONCE([fchdir memmove memset strrchr])
+  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>])
 ])