Now that we're assuming Autoconf 2.59 or later, we can remove the
'restrict' module. (Actually, it is needed only for pre-2.58.) I
installed the following. This steps on the toes of Simon, I believe
-- if you object please let me know, but it is a bit unusual to
_remove_ a module.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/ChangeLog,v
retrieving revision 1.597
diff -p -u -r1.597 ChangeLog
--- ChangeLog 8 Aug 2006 14:39:04 -0000 1.597
+++ ChangeLog 9 Aug 2006 22:51:54 -0000
@@ -1,3 +1,20 @@
+2006-08-09 Paul Eggert <[EMAIL PROTECTED]>
+
+ * modules/restrict: Remove; no longer needed now that we assume
+ Autoconf 2.59 or later.
+ * MODULES.html.sh: Remove 'restrict'.
+ * modules/argp (Depends-on): Remove 'restrict'.
+ * modules/base64 (Depends-on): Likewise.
+ * modules/gc (Depends-on): Likewise.
+ * modules/getaddrinfo (Depends-on): Likewise.
+ * modules/glob (Depends-on): Likewise.
+ * modules/inet_ntop (Depends-on): Likewise.
+ * modules/inet_pton (Depends-on): Likewise.
+ * modules/memxor (Depends-on): Likewise.
+ * modules/regex (Depends-on): Likewise.
+ * modules/strtok_r (Depends-on): Likewise.
+ * modules/time_r (Depends-on): Likewise.
+
2006-08-08 Eric Blake <[EMAIL PROTECTED]>
* modules/verror: New module.
Index: MODULES.html.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/MODULES.html.sh,v
retrieving revision 1.134
diff -p -u -r1.134 MODULES.html.sh
--- MODULES.html.sh 8 Aug 2006 14:39:04 -0000 1.134
+++ MODULES.html.sh 9 Aug 2006 22:51:54 -0000
@@ -1666,16 +1666,6 @@ func_all_modules ()
func_wrap H2
func_echo "$element"
- element="Keywords"
- element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"`
- func_section_wrap isoc_sup_keywords
- func_wrap H3
- func_echo "$element"
-
- func_begin_table
- func_module restrict
- func_end_table
-
element="Sizes of integer types <limits.h>"
element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"`
func_section_wrap isoc_sup_limits
Index: m4/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/ChangeLog,v
retrieving revision 1.894
diff -p -u -r1.894 ChangeLog
--- m4/ChangeLog 9 Aug 2006 22:27:28 -0000 1.894
+++ m4/ChangeLog 9 Aug 2006 22:51:55 -0000
@@ -1,5 +1,14 @@
2006-08-09 Paul Eggert <[EMAIL PROTECTED]>
+ * argp.m4 (gl_ARGP): Require AC_C_RESTRICT.
+ * gc.m4 (gl_PREREQ_GC): Likewise.
+ * glob.m4 (gl_PREREQ_GLOB): Likewise.
+ * inet_ntop.m4 (gl_PREREQ_INET_NTOP): Likewise.
+ * inet_pton.m4 (gl_PREREQ_INET_PTON): Likewise.
+ * memxor.m4 (gl_MEMXOR): Likewise.
+ * restrict.m4: Remove; no longer needed. All remaining uses of
+ gl_C_RESTRICT replaced by AC_C_RESTRICT.
+
Merge from coreutils.
* regex.m4 (gl_PREREQ_REGEX): Require AC_C_RESTRICT, not
gl_C_RESTRICT, now that we assume Autoconf 2.59 or later.
Index: m4/argp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/argp.m4,v
retrieving revision 1.9
diff -p -u -r1.9 argp.m4
--- m4/argp.m4 20 Apr 2006 22:28:33 -0000 1.9
+++ m4/argp.m4 9 Aug 2006 22:51:55 -0000
@@ -1,4 +1,4 @@
-# argp.m4 serial 6
+# argp.m4 serial 7
dnl Copyright (C) 2003-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,
@@ -7,6 +7,7 @@ dnl with or without modifications, as lo
AC_DEFUN([gl_ARGP],
[
AC_REQUIRE([AC_C_INLINE])
+ AC_REQUIRE([AC_C_RESTRICT])
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_GETOPT_SUBSTITUTE])
Index: m4/base64.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/base64.m4,v
retrieving revision 1.2
diff -p -u -r1.2 base64.m4
--- m4/base64.m4 23 Jan 2005 08:06:57 -0000 1.2
+++ m4/base64.m4 9 Aug 2006 22:51:55 -0000
@@ -1,5 +1,5 @@
-# base64.m4 serial 2
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+# base64.m4 serial 3
+dnl Copyright (C) 2004, 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.
@@ -12,5 +12,5 @@ AC_DEFUN([gl_FUNC_BASE64],
# Prerequisites of lib/base64.c.
AC_DEFUN([gl_PREREQ_BASE64], [
AC_REQUIRE([AC_C_INLINE])
- AC_REQUIRE([gl_C_RESTRICT])
+ AC_REQUIRE([AC_C_RESTRICT])
])
Index: m4/gc.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/gc.m4,v
retrieving revision 1.5
diff -p -u -r1.5 gc.m4
--- m4/gc.m4 7 Mar 2006 13:17:10 -0000 1.5
+++ m4/gc.m4 9 Aug 2006 22:51:55 -0000
@@ -1,4 +1,4 @@
-# gc.m4 serial 2
+# gc.m4 serial 3
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,
@@ -21,4 +21,8 @@ AC_DEFUN([gl_GC],
])
# Prerequisites of lib/gc.h
-AC_DEFUN([gl_PREREQ_GC], [:])
+AC_DEFUN([gl_PREREQ_GC],
+[
+ AC_REQUIRE([AC_C_RESTRICT])
+ :
+])
Index: m4/getaddrinfo.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getaddrinfo.m4,v
retrieving revision 1.17
diff -p -u -r1.17 getaddrinfo.m4
--- m4/getaddrinfo.m4 28 Jun 2006 11:08:35 -0000 1.17
+++ m4/getaddrinfo.m4 9 Aug 2006 22:51:55 -0000
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 10
+# getaddrinfo.m4 serial 11
dnl Copyright (C) 2004, 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,
@@ -52,7 +52,7 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
LIBS="$LIBS -lws2_32"
fi
])
- AC_REQUIRE([gl_C_RESTRICT])
+ AC_REQUIRE([AC_C_RESTRICT])
AC_REQUIRE([gl_SOCKET_FAMILIES])
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
AC_REQUIRE([AC_C_INLINE])
Index: m4/glob.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/glob.m4,v
retrieving revision 1.8
diff -p -u -r1.8 glob.m4
--- m4/glob.m4 11 Jul 2006 06:02:51 -0000 1.8
+++ m4/glob.m4 9 Aug 2006 22:51:55 -0000
@@ -1,4 +1,4 @@
-# glob.m4 serial 5
+# glob.m4 serial 6
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,
@@ -73,6 +73,7 @@ if (glob ("conf*-globtest", 0, NULL, &fo
# Prerequisites of lib/glob.*.
AC_DEFUN([gl_PREREQ_GLOB],
[ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
+ AC_REQUIRE([AC_C_RESTRICT])dnl
AC_REQUIRE([AC_GNU_SOURCE])dnl
AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
Index: m4/inet_ntop.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/inet_ntop.m4,v
retrieving revision 1.4
diff -p -u -r1.4 inet_ntop.m4
--- m4/inet_ntop.m4 28 Jul 2006 16:31:48 -0000 1.4
+++ m4/inet_ntop.m4 9 Aug 2006 22:51:55 -0000
@@ -1,4 +1,4 @@
-# inet_ntop.m4 serial 2
+# inet_ntop.m4 serial 3
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,
@@ -15,4 +15,5 @@ AC_DEFUN([gl_PREREQ_INET_NTOP], [
AC_CHECK_HEADERS_ONCE([netinet/in.h arpa/inet.h])
AC_CHECK_DECLS([inet_ntop],,,[#include <arpa/inet.h>])
AC_REQUIRE([gl_SOCKET_FAMILIES])
+ AC_REQUIRE([AC_C_RESTRICT])
])
Index: m4/inet_pton.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/inet_pton.m4,v
retrieving revision 1.2
diff -p -u -r1.2 inet_pton.m4
--- m4/inet_pton.m4 28 Jul 2006 16:31:48 -0000 1.2
+++ m4/inet_pton.m4 9 Aug 2006 22:51:55 -0000
@@ -1,4 +1,4 @@
-# inet_pton.m4 serial 1
+# inet_pton.m4 serial 2
dnl Copyright (C) 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,
@@ -15,4 +15,5 @@ AC_DEFUN([gl_PREREQ_INET_PTON], [
AC_CHECK_HEADERS_ONCE([netinet/in.h arpa/inet.h])
AC_CHECK_DECLS([inet_pton],,,[#include <arpa/inet.h>])
AC_REQUIRE([gl_SOCKET_FAMILIES])
+ AC_REQUIRE([AC_C_RESTRICT])
])
Index: m4/memxor.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/memxor.m4,v
retrieving revision 1.3
diff -p -u -r1.3 memxor.m4
--- m4/memxor.m4 7 Oct 2005 08:47:51 -0000 1.3
+++ m4/memxor.m4 9 Aug 2006 22:51:55 -0000
@@ -1,5 +1,5 @@
-# memxor.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# memxor.m4 serial 2
+dnl Copyright (C) 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,4 +8,5 @@ AC_DEFUN([gl_MEMXOR],
[
AC_LIBSOURCES([memxor.h, memxor.c])
AC_LIBOBJ([memxor])
+ AC_REQUIRE([AC_C_RESTRICT])
])
Index: modules/argp
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/argp,v
retrieving revision 1.13
diff -p -u -r1.13 argp
--- modules/argp 9 Dec 2005 12:31:34 -0000 1.13
+++ modules/argp 9 Aug 2006 22:51:55 -0000
@@ -25,7 +25,6 @@ strchrnul
sysexits
mempcpy
strndup
-restrict
strcase
extensions
vsnprintf
Index: modules/base64
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/base64,v
retrieving revision 1.1
diff -p -u -r1.1 base64
--- modules/base64 30 Nov 2004 20:46:52 -0000 1.1
+++ modules/base64 9 Aug 2006 22:51:55 -0000
@@ -8,7 +8,6 @@ m4/base64.m4
Depends-on:
stdbool
-restrict
configure.ac:
gl_FUNC_BASE64
Index: modules/gc
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/gc,v
retrieving revision 1.3
diff -p -u -r1.3 gc
--- modules/gc 21 Oct 2005 13:14:34 -0000 1.3
+++ modules/gc 9 Aug 2006 22:51:55 -0000
@@ -9,7 +9,6 @@ m4/gc.m4
Depends-on:
havelib
-restrict
configure.ac:
gl_GC
Index: modules/getaddrinfo
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getaddrinfo,v
retrieving revision 1.9
diff -p -u -r1.9 getaddrinfo
--- modules/getaddrinfo 6 Jul 2006 13:53:54 -0000 1.9
+++ modules/getaddrinfo 9 Aug 2006 22:51:55 -0000
@@ -8,7 +8,6 @@ lib/gai_strerror.c
m4/getaddrinfo.m4
Depends-on:
-restrict
gettext-h
snprintf
socklen
Index: modules/glob
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/glob,v
retrieving revision 1.4
diff -p -u -r1.4 glob
--- modules/glob 8 Mar 2006 01:37:15 -0000 1.4
+++ modules/glob 9 Aug 2006 22:51:55 -0000
@@ -15,7 +15,6 @@ extensions
fnmatch
getlogin_r
mempcpy
-restrict
stat-macros
stdbool
strdup
Index: modules/inet_ntop
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/inet_ntop,v
retrieving revision 1.7
diff -p -u -r1.7 inet_ntop
--- modules/inet_ntop 28 Jul 2006 17:27:50 -0000 1.7
+++ modules/inet_ntop 9 Aug 2006 22:51:55 -0000
@@ -7,7 +7,6 @@ lib/inet_ntop.c
m4/inet_ntop.m4
Depends-on:
-restrict
socklen
sys_socket
arpa_inet
Index: modules/inet_pton
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/inet_pton,v
retrieving revision 1.4
diff -p -u -r1.4 inet_pton
--- modules/inet_pton 28 Jul 2006 17:27:50 -0000 1.4
+++ modules/inet_pton 9 Aug 2006 22:51:55 -0000
@@ -7,7 +7,6 @@ lib/inet_pton.c
m4/inet_pton.m4
Depends-on:
-restrict
socklen
sys_socket
arpa_inet
Index: modules/memxor
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/memxor,v
retrieving revision 1.1
diff -p -u -r1.1 memxor
--- modules/memxor 5 Oct 2005 13:29:53 -0000 1.1
+++ modules/memxor 9 Aug 2006 22:51:55 -0000
@@ -7,7 +7,6 @@ lib/memxor.c
m4/memxor.m4
Depends-on:
-restrict
configure.ac:
gl_MEMXOR
Index: modules/regex
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/regex,v
retrieving revision 1.13
diff -p -u -r1.13 regex
--- modules/regex 10 Apr 2006 06:43:33 -0000 1.13
+++ modules/regex 9 Aug 2006 22:51:55 -0000
@@ -16,7 +16,6 @@ alloca
extensions
gettext-h
malloc
-restrict
strcase
ssize_t
Index: modules/strtok_r
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/strtok_r,v
retrieving revision 1.2
diff -p -u -r1.2 strtok_r
--- modules/strtok_r 10 Jan 2006 22:02:14 -0000 1.2
+++ modules/strtok_r 9 Aug 2006 22:51:55 -0000
@@ -7,7 +7,6 @@ lib/strtok_r.h
m4/strtok_r.m4
Depends-on:
-restrict
configure.ac:
gl_FUNC_STRTOK_R
Index: modules/time_r
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/time_r,v
retrieving revision 1.6
diff -p -u -r1.6 time_r
--- modules/time_r 12 Apr 2006 16:50:51 -0000 1.6
+++ modules/time_r 9 Aug 2006 22:51:55 -0000
@@ -8,7 +8,6 @@ m4/time_r.m4
Depends-on:
extensions
-restrict
configure.ac:
gl_TIME_R
