X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fglob.m4;h=767c54d7add9f90bf6634d4e84a6bfb4ddd72357;hb=da2a210c9c4d5510c5e614053a64faeed7d99b1c;hp=5d80e058785c87a59142f7d4d31d9f30978eda12;hpb=5bf19ea1565c4f9613c838f0cd57feb5e2391338;p=gnulib.git

diff --git a/m4/glob.m4 b/m4/glob.m4
index 5d80e0587..767c54d7a 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,4 +1,4 @@
-# glob.m4 serial 4
+# glob.m4 serial 7
 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,6 @@ AC_DEFUN([gl_GLOB_SUBSTITUTE],
   gl_PREREQ_GLOB
 
   GLOB_H=glob.h
-  AC_LIBSOURCES([glob.c, glob_.h, glob-libc.h])
   AC_LIBOBJ([glob])
   AC_SUBST([GLOB_H])
 ])
@@ -73,8 +72,8 @@ if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH) return 1;]]),
 # Prerequisites of lib/glob.*.
 AC_DEFUN([gl_PREREQ_GLOB],
 [ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
+  AC_REQUIRE([AC_C_RESTRICT])dnl
   AC_REQUIRE([AC_GNU_SOURCE])dnl
-  AC_CHECK_HEADERS_ONCE([dirent.h])dnl
   AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
   AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
   :])