X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=582697b60514f0d7a61c2cb3fbc5b706be6be847;hb=fdd1b511c5c12912aae79b58e0c5f6ffa0492d6e;hp=8693db986fec5f5159d8e7eb92f84858a143427f;hpb=2f2978ede97205c49d3e568ccffa5a04fb53326b;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index 8693db986..582697b60 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,5 +1,5 @@
-#serial 14
-dnl Copyright (C) 2005-2008 Free Software Foundation, Inc.
+#serial 20
+dnl Copyright (C) 2005-2013 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,21 +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
 
   AC_CHECK_FUNCS_ONCE([fstatfs])
-  AC_CHECK_HEADERS_ONCE([sys/param.h sys/vfs])dnl
-  AC_CHECK_MEMBERS([struct statfs.f_type])
+  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>])
 ])