Sync from gnulib.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 8e8c8d7..4b6152f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,6 +1,10 @@
 2006-01-10  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * getaddrinfo.m4, localcharset.m4, md5.m4: Sync from gnulib.
+       * argmatch.m4 (gl_ARGMATCH): Don't require gl_FUNC_MEMCMP, for the
+       sake of packages that don't want to worry about ancient systems.
+
+       * getaddrinfo.m4, localcharset.m4, md5.m4, memcoll.m4:
+       Sync from gnulib.
 
 2006-01-10  Jim Meyering  <jim@meyering.net>
 

diff --git a/m4/argmatch.m4 b/m4/argmatch.m4
index c0d14cf..cdf9522 100644 (file)
--- a/m4/argmatch.m4
+++ b/m4/argmatch.m4
@@ -1,5 +1,5 @@
-#serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 2
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8,7 +8,4 @@ AC_DEFUN([gl_ARGMATCH],
 [
   AC_LIBSOURCES([argmatch.c, argmatch.h])
   AC_LIBOBJ([argmatch])
-
-  dnl Prerequisites.
-  AC_REQUIRE([gl_FUNC_MEMCMP])
 ])

diff --git a/m4/memcoll.m4 b/m4/memcoll.m4
index 6f73412..f9cd1de 100644 (file)
--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,5 +1,5 @@
-# memcoll.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# memcoll.m4 serial 6
+dnl Copyright (C) 2002, 2003, 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,6 +10,5 @@ AC_DEFUN([gl_MEMCOLL],
   AC_LIBOBJ([memcoll])
 
   dnl Prerequisites of lib/memcoll.c.
-  AC_REQUIRE([AC_FUNC_MEMCMP])
   AC_FUNC_STRCOLL
 ])