summaryrefslogtreecommitdiff
path: root/m4/fts.m4
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@lorry>2016-01-20 10:55:18 +0000
committerLorry Tar Creator <lorry-tar-importer@lorry>2016-01-20 10:55:18 +0000
commit70e9163c9c18e995515598085cb824e554eb7ae7 (patch)
treea42dc8b2a6c031354bf31472de888bfc8a060132 /m4/fts.m4
parentcbf5993c43f49281173f185863577d86bfac6eae (diff)
downloadcoreutils-tarball-master.tar.gz
Diffstat (limited to 'm4/fts.m4')
-rw-r--r--m4/fts.m420
1 files changed, 7 insertions, 13 deletions
diff --git a/m4/fts.m4 b/m4/fts.m4
index cceb48f..b7d8570 100644
--- 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-2016 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>])
])