X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=5c92b3b06b8896b0465e6f28ff16b0e0716e931c;hb=cd7b0a9813277c007918335dcb7554ec3dab0cf9;hp=bdba388b8e5d1761ebffa2aade3ad21acad3b1ac;hpb=af791bcb46dd123f336f10c05d8fbb708e2022a2;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index bdba388b8..5c92b3b06 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,5 +1,5 @@
-#serial 15
-dnl Copyright (C) 2005-2008 Free Software Foundation, Inc.
+#serial 19
+dnl Copyright (C) 2005-2012 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,23 +9,15 @@ 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.
+  AC_REQUIRE([AC_C_INLINE])
   gl_FUNC_OPENAT
 
   AC_CHECK_FUNCS_ONCE([fstatfs])
-  AC_CHECK_HEADERS_ONCE([sys/param.h sys/vfs])dnl
+  AC_CHECK_HEADERS_ONCE([sys/param.h sys/vfs.h])dnl
   AC_CHECK_MEMBERS([struct statfs.f_type],,,
     [$ac_includes_default
-     #include <sys/statfs.h>])
+     #include <sys/vfs.h>])
 ])