gnulib no longer has a 'restrict' module.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 90067a915a46c59230f3cbbda95087227c60bb47..af28c58ccb6a913b1622664f3e9cb258bd07f95a 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * regex.m4 (gl_PREREQ_REGEX): Adjust to gnulib change: use
+       AC_C_RESTRICT instead of gl_C_RESTRICT.
+
 2006-07-31  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (EXTRA_DIST): Remove files now taken from gnulib or

diff --git a/gettext-tools/m4/regex.m4 b/gettext-tools/m4/regex.m4
index 19ff71bfaa23fab6b0e2dda0d1a3f19c1f5e157e..513f59bc4904ef35731d9eefb1ca2b36fb0f47e6 100644 (file)
--- a/gettext-tools/m4/regex.m4
+++ b/gettext-tools/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 23
+#serial 24
 
 dnl Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 Free
 dnl Software Foundation, Inc.
@@ -118,7 +118,7 @@ AC_DEFUN([gl_PREREQ_REGEX],
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_REQUIRE([gl_C_RESTRICT])
+  AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 5f7cc1af7f130f317147edd1fd911616614be897..cdabdf6c54fb38dfb32bc0aee8d3aa9cd2f16872 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-16  Bruno Haible  <bruno@clisp.org>
+
+       * modules/gettext-tools-misc (Files): Remove m4/restrict.m4, no longer
+       in gnulib.
+
 2006-07-31  Bruno Haible  <bruno@clisp.org>
 
        * lib/propername.c: Remove temporary hack.

diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index 0875255d172f39b098555851e5b9bd65838f3464..105d871e9f0e82d235cd64e40748461a0b1f6033 100644 (file)
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -4,7 +4,6 @@ Files:
 m4/hard-locale.m4
 m4/mbrtowc.m4
 m4/memchr.m4
-m4/restrict.m4
 m4/strdup.m4
 
 Depends-on: