* fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Don't require AC_C_CONST, since

it's obsolete.
* strftime.m4 (gl_FUNC_GNU_STRFTIME): Likewise.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3ac1c64ca8d49b0400e7eb72ea81ab05345edc42..c39d3f2dbecf6bbddb3237d5b3f6096f194f0c2d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Don't require AC_C_CONST, since
+       it's obsolete.
+       * strftime.m4 (gl_FUNC_GNU_STRFTIME): Likewise.
+
 2006-06-28  Bruno Haible  <bruno@clisp.org>
 
        * wcwidth.m4 (gl_FUNC_WCWIDTH): Also require AC_C_INLINE and

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index e879bbde8ef0f9aeb705c01bdb82843591e9ddf9..d8b93827fa64a045d1cddd6916c8d3bdadfc6de8 100644 (file)
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -3,7 +3,7 @@
 # This is a modified version of autoconf's AC_FUNC_FNMATCH.
 # This file should be simplified after Autoconf 2.57 is required.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -61,8 +61,7 @@ AS_IF([test $$2 = yes], [$3], [$4])
 # ------------------
 # Prepare the replacement of fnmatch.
 AC_DEFUN([_AC_LIBOBJ_FNMATCH],
-[AC_REQUIRE([AC_C_CONST])dnl
-AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+[AC_REQUIRE([AC_FUNC_ALLOCA])dnl
 AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl
 AC_CHECK_DECLS([getenv])
 AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])

diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 64cdf2b6aec7a94dba1a0b53e0eb44e8811736ce..bc73791a97b97ae67cb84d4267d118fcb7d1520b 100644 (file)
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,6 +1,6 @@
-#serial 25
+#serial 26
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -11,7 +11,6 @@
 
 AC_DEFUN([gl_FUNC_GNU_STRFTIME],
 [AC_REQUIRE([gl_FUNC_STRFTIME])dnl
- AC_REQUIRE([AC_C_CONST])dnl
 ])
 
 # These are the prerequisite macros for GNU's strftime.c replacement.