X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Ffts.m4;h=4a4a21e5e9f0115f892d2f42e690c21ef9c317d9;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=f9f5f6b7b8257bc213f6d30d1b1e0ef73d4386ec;hpb=d76a6493392c315ba9da4a262efaa430b1a72476;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index f9f5f6b7b..4a4a21e5e 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,33 +1,27 @@
-#serial 7
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#serial 18
+dnl Copyright (C) 2005-2010 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_LIBSOURCES([fts-cycle.c])
-])
-
-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],
 [
-  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([AC_C_INLINE])
+  gl_FUNC_OPENAT
 
-  # Checks for header files.
-  AC_CHECK_HEADERS_ONCE([dirent.h 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>])
 ])