X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fd-type.m4;h=615b926c4bf28e5a5443fa650acf74c646d1bca9;hb=c8068b3df116650efbf0fbf2d790c706577ae972;hp=bf94903fc5f394393747a79e3a9f6da5dcd0f94b;hpb=7ac215b644df7c2f0145b0b093c5e3298746bc85;p=gnulib.git

diff --git a/m4/d-type.m4 b/m4/d-type.m4
index bf94903fc..615b926c4 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,42 +1,32 @@
-#serial 3
+# serial 11
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_type.
 dnl
 
-AC_DEFUN(jm_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
-       [
-#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;],
+# Copyright (C) 1997, 1999-2004, 2006, 2009-2010 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.
 
-       jm_cv_struct_dirent_d_type=yes,
-       jm_cv_struct_dirent_d_type=no)
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
+  [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>
+#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(D_TYPE_IN_DIRENT, 1,
-  [Define if there is a member named d_type in the struct describing
-   directory headers.])
+   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
   ]
 )