X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Ffts.m4;h=98cb610b9da81a547f1e32c5227333019a279bd9;hb=b40d2e71aa6bbe8f25c53323a94e31f391db7dfd;hp=2c9348e637e0ae666ffc5efa1727619048f9e3be;hpb=901bc47c9a8db854db97bb28780352748020c81d;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index 2c9348e63..98cb610b9 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,31 +1,23 @@
-#serial 11
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#serial 19
+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_REQUIRE([gl_FUNC_FTS_CORE])
-])
-
-AC_DEFUN([gl_FUNC_FTS_LGPL],
-[
-  AC_REQUIRE([gl_FUNC_FTS_CORE])
-  AC_DEFINE([_LGPL_PACKAGE], 1,
-    [Define to 1 if compiling for a package to be distributed under the
-     GNU Lesser Public License.])
+  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([gl_FUNC_OPENAT])
+  AC_REQUIRE([AC_C_INLINE])
+  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>])
 ])