summaryrefslogtreecommitdiffstats
path: root/m4/fts.m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4/fts.m4')
-rw-r--r--m4/fts.m419
1 files changed, 14 insertions, 5 deletions
diff --git a/m4/fts.m4 b/m4/fts.m4
index 123fcba0..2fb39c72 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,5 +1,5 @@
-#serial 20
-dnl Copyright (C) 2005-2017 Free Software Foundation, Inc.
+#serial 21
+dnl Copyright (C) 2005-2018 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.
@@ -16,7 +16,16 @@ AC_DEFUN([gl_FUNC_FTS_CORE],
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>])
+ if test "$ac_cv_func_fstatfs,$ac_cv_header_sys_vfs_h" = yes,yes; then
+ AC_CHECK_MEMBERS([struct statfs.f_type], [], [],
+ [[$ac_includes_default
+ #include <sys/vfs.h>
+ ]])
+ if test "$ac_cv_member_struct_statfs_f_type" = yes; then
+ AC_CHECK_TYPES([__fsword_t], [], [],
+ [[$ac_includes_default
+ #include <sys/vfs.h>
+ ]])
+ fi
+ fi
])