X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Freaddir.m4;h=7783ef020d97ee2dec3058f56f4e66015f1a0b04;hb=376384bdbda5e64de9784274b19ac933dca336b9;hp=8a29e58bc1f1a5fad9896e5157c8d6aaf9ecc20f;hpb=8d94f29880dc4f330c8c0d65a0da49c1905dcf97;p=gnulib.git

diff --git a/m4/readdir.m4 b/m4/readdir.m4
index 8a29e58bc..7783ef020 100644
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,4 +1,11 @@
-#serial 6
+#serial 8
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003 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.
 
 dnl SunOS's readdir is broken in such a way that rm.c has to add extra code
 dnl to test whether a NULL return value really means there are no more files
@@ -18,7 +25,6 @@ dnl Written by Jim Meyering.
 AC_DEFUN([GL_FUNC_READDIR],
 [dnl
 AC_REQUIRE([AC_HEADER_DIRENT])
-AC_CHECK_HEADERS_ONCE(string.h)
 AC_CACHE_CHECK([for working readdir], gl_cv_func_working_readdir,
   [dnl
   # Arrange for deletion of the temporary directory this test creates, in
@@ -28,9 +34,7 @@ AC_CACHE_CHECK([for working readdir], gl_cv_func_working_readdir,
   AC_TRY_RUN(
 [#   include <stdio.h>
 #   include <sys/types.h>
-#   if HAVE_STRING_H
-#    include <string.h>
-#   endif
+#   include <string.h>
 
 #   ifdef HAVE_DIRENT_H
 #    include <dirent.h>