Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / fts.m4

diff --git a/m4/fts.m4 b/m4/fts.m4
index cceb48f..80acc2c 100644 (file)
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,5 +1,5 @@
-#serial 13
-dnl Copyright (C) 2005-2007 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.
@@ -9,20 +9,14 @@ AC_DEFUN([gl_FUNC_FTS],
   gl_FUNC_FTS_CORE
 ])
 
-AC_DEFUN([gl_FUNC_FTS_LGPL],
-[
-  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.
   gl_FUNC_OPENAT
 
-  # Checks for header files.
-  AC_CHECK_HEADERS_ONCE([sys/param.h])dnl
+  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>])
 ])