diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-09 16:59:35 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-09 16:59:35 +0000 |
| commit | fbb436b3f842904e6617040a8614d0b068fd662b (patch) | |
| tree | 73ca4ec7ed6ce4753b7e11b8bd0767b5cdd66c04 /m4/d-type.m4 | |
| parent | cb052e4f6cc723bc408f32963e921705f3286c94 (diff) | |
| download | coreutils-fbb436b3f842904e6617040a8614d0b068fd662b.tar.xz | |
Update from gnulib.
Diffstat (limited to 'm4/d-type.m4')
| -rw-r--r-- | m4/d-type.m4 | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/m4/d-type.m4 b/m4/d-type.m4 index 6f3125c7e..f4be1ce62 100644 --- a/m4/d-type.m4 +++ b/m4/d-type.m4 @@ -1,11 +1,11 @@ -#serial 8 +#serial 9 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_type. dnl -# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 Free Software +# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software # Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -13,7 +13,7 @@ dnl # with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE], - [AC_REQUIRE([AC_HEADER_DIRENT])dnl + [AC_CHECK_HEADERS_ONCE([dirent.h])dnl AC_CACHE_CHECK([for d_type member in directory struct], jm_cv_struct_dirent_d_type, [AC_TRY_LINK(dnl @@ -21,18 +21,10 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE], #include <sys/types.h> #ifdef HAVE_DIRENT_H # include <dirent.h> -#else /* not HAVE_DIRENT_H */ +#else # define dirent direct -# ifdef HAVE_SYS_NDIR_H -# include <sys/ndir.h> -# endif /* HAVE_SYS_NDIR_H */ -# ifdef HAVE_SYS_DIR_H -# include <sys/dir.h> -# endif /* HAVE_SYS_DIR_H */ -# ifdef HAVE_NDIR_H -# include <ndir.h> -# endif /* HAVE_NDIR_H */ -#endif /* HAVE_DIRENT_H */ +# include <ndir.h> +#endif ], [struct dirent dp; dp.d_type = 0;], |