X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fd-type.m4;h=0190d73bc74ae1f73a0a0a39a1535ad640b0d579;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=9c62198d517d2977d972c40a07127327d5732a05;hpb=23fe10e274cf20fb2cb75ea1da9556a733106657;p=gnulib.git

diff --git a/m4/d-type.m4 b/m4/d-type.m4
index 9c62198d5..0190d73bc 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,40 +1,30 @@
-#serial 7
+# serial 11
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_type.
 dnl
 
+# Copyright (C) 1997, 1999-2004, 2006, 2009-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# 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_CACHE_CHECK([for d_type member in directory struct],
-		  jm_cv_struct_dirent_d_type,
-     [AC_TRY_LINK(dnl
-       [
+  [AC_CACHE_CHECK([for d_type member in directory struct],
+                  gl_cv_struct_dirent_d_type,
+     [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else /* not HAVE_DIRENT_H */
-# 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 */
-       ],
-       [struct dirent dp; dp.d_type = 0;],
-
-       jm_cv_struct_dirent_d_type=yes,
-       jm_cv_struct_dirent_d_type=no)
+#include <dirent.h>
+         ]],
+         [[struct dirent dp; dp.d_type = 0;]])],
+       [gl_cv_struct_dirent_d_type=yes],
+       [gl_cv_struct_dirent_d_type=no])
      ]
    )
-   if test $jm_cv_struct_dirent_d_type = yes; then
-     AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1,
+   if test $gl_cv_struct_dirent_d_type = yes; then
+     AC_DEFINE([HAVE_STRUCT_DIRENT_D_TYPE], [1],
        [Define if there is a member named d_type in the struct describing
         directory headers.])
    fi