diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-10 06:06:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-10 06:07:03 -0700 |
| commit | 8af35ddc835fa799ab6c42630349f714d945b832 (patch) | |
| tree | 6386f985e2f6ea0b25cf8247478dc3324d048209 /m4/fts.m4 | |
| parent | 009e65cc804021f388d17d6344fd62d551df8111 (diff) | |
| download | gnulib-8af35ddc835fa799ab6c42630349f714d945b832.tar.gz | |
fts: port recent changes to CentOS 6
Problem reported by Tom G. Christensen in:
http://lists.gnu.org/archive/html/bug-gnulib/2017-08/msg00064.html
* lib/fts.c (fsword): New type.
(struct dev_type, filesystem_type): Use it.
* m4/fts.m4 (gl_FUNC_FTS_CORE): Check for __fsword_t.
Also, check for f_type only if fstatfs and sys/vfs.h work.
Diffstat (limited to 'm4/fts.m4')
| -rw-r--r-- | m4/fts.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -1,4 +1,4 @@ -#serial 20 +#serial 21 dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -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 ]) |