From fbb436b3f842904e6617040a8614d0b068fd662b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Jul 2006 16:59:35 +0000 Subject: Update from gnulib. --- m4/d-type.m4 | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'm4/d-type.m4') 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 #ifdef HAVE_DIRENT_H # include -#else /* not HAVE_DIRENT_H */ +#else # define dirent direct -# ifdef HAVE_SYS_NDIR_H -# include -# endif /* HAVE_SYS_NDIR_H */ -# ifdef HAVE_SYS_DIR_H -# include -# endif /* HAVE_SYS_DIR_H */ -# ifdef HAVE_NDIR_H -# include -# endif /* HAVE_NDIR_H */ -#endif /* HAVE_DIRENT_H */ +# include +#endif ], [struct dirent dp; dp.d_type = 0;], -- cgit v1.2.3-70-g09d2