summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog2
-rw-r--r--m4/jm-macros.m41
-rw-r--r--m4/readdir.m44
3 files changed, 5 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 17aadd5d5..5747b9732 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,7 @@
2006-09-28 Jim Meyering <jim@meyering.net>
+ * jm-macros.m4: Require the new macro.
+ * readdir.m4 (gl_FUNC_READDIR): Rename from GL_FUNC_READDIR.
* readdir.m4: Revivify this file.
We need it to work around a bug on Darwin 0.7.x.
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index e0188e66b..199e5c782 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -45,6 +45,7 @@ AC_DEFUN([gl_MACROS],
AC_REQUIRE([gl_PREREQ])
AC_REQUIRE([AC_FUNC_FSEEKO])
+ AC_REQUIRE([gl_FUNC_READDIR])
AC_CONFIG_LIBOBJ_DIR([lib])
diff --git a/m4/readdir.m4 b/m4/readdir.m4
index 7783ef020..5f0176e41 100644
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,6 +1,6 @@
#serial 8
-# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003 Free Software
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2006 Free Software
# Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -22,7 +22,7 @@ dnl Define HAVE_WORKING_READDIR if readdir does *not* have this problem.
dnl Written by Jim Meyering.
-AC_DEFUN([GL_FUNC_READDIR],
+AC_DEFUN([gl_FUNC_READDIR],
[dnl
AC_REQUIRE([AC_HEADER_DIRENT])
AC_CACHE_CHECK([for working readdir], gl_cv_func_working_readdir,