From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 28 Jun 2006 22:00:55 +0000 (+0000)
Subject: * fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Don't require AC_C_CONST, since
X-Git-Tag: cvs-readonly~2302
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=812b80c1ef24e7c7ff56ed9c4d8bb8d9bbbb102c;p=gnulib.git

* 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 3ac1c64ca..c39d3f2db 100644
--- 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 e879bbde8..d8b93827f 100644
--- 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 64cdf2b6a..bc73791a9 100644
--- 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.