* modules/readutmp (Maintainer): Add Paul Eggert.

* modules/strtok_r: Depend on module restrict.
* m4/readutmp.m4 (gl_READUTMP): Don't require gl_FUNC_FREE. Use a
module dependency instead.

diff --git a/ChangeLog b/ChangeLog
index 634b4d88689f38c9c3285c1846213fa36eae6ac9..4b19aa2e1cf3f84a179cb3ad24b1703a0261b1e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
-2006-01-08  Bruno Haible  <bruno@clisp.org>
+2006-01-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modules/readutmp (Maintainer): Add myself.
+
+2006-01-10  Bruno Haible  <bruno@clisp.org>
 
        * modules/readutmp: Depend on module free.
+       * modules/strtok_r: Depend on module restrict.
 
 2006-01-10  Simon Josefsson  <jas@extundo.com>
 
@@ -284,7 +289,7 @@
 
 2005-10-13  Oskar Liljeblad  <oskar@osk.mine.nu>
 
-        * modules/human (Depends-on): Depend on xstrtoumax, not xstrtol.
+       * modules/human (Depends-on): Depend on xstrtoumax, not xstrtol.
 
 2005-10-13  Simon Josefsson  <jas@extundo.com>
 
@@ -2212,7 +2217,7 @@
        * modules/gettext: Add files m4/nls.m4 and m4/po.m4.
        * config/config.rpath: Upgrade to gettext-0.12.1.
 
-2003-05-22    <karl@gnu.org>
+2003-05-22  Karl Berry  <karl@gnu.org>
 
        * gnulib-tool (func_usage): =LIBRARY not =libRARY in help msg.
 
@@ -2365,7 +2370,7 @@
        * gnulib-tool (func_all_modules): Ignore files ending in ~.
        * MODULES.html.sh: Likewise.
 
-2003-01-09    <karl@gnu.org>
+2003-01-09  Karl Berry  <karl@gnu.org>
 
        * MODULES.html.sh: include `dirname $0` in PATH, to find
        gnulib-tool.
@@ -2381,7 +2386,7 @@
        (func_module): Make it work with sed-3.02.
        * MODULES.txt: Remove file.
 
-2003-01-01    <karl@gnu.org>
+2003-01-01  Karl Berry  <karl@gnu.org>
 
        * gnulib-tool (func_verify_module): report module name $module in
        error message, not $1.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index aba416d1cfef203e9560c198f88b17d4bfaa8b1c..ebc13aec36d976414b6dd12c05322486fdf62683 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-10  Bruno Haible  <bruno@clisp.org>
+
+       * m4/readutmp.m4 (gl_READUTMP): Don't require gl_FUNC_FREE. Use a
+       module dependency instead.
+
 2006-01-10  Jim Meyering  <jim@meyering.net>
 
        * fpending.m4: Also include <stdio.h>, for Dragonfly.

diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index ac413f6c14a64c3e79332a3063aeee126a8a3012..57aa2dc01ef4def819158c27c2917cdbc91c6f24 100644 (file)
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,5 +1,5 @@
-# readutmp.m4 serial 9
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# readutmp.m4 serial 10
+dnl Copyright (C) 2002, 2003, 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,6 @@ AC_DEFUN([gl_READUTMP],
 
   dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.
   AC_REQUIRE([AC_C_INLINE])
-  AC_REQUIRE([gl_FUNC_FREE])
   AC_CHECK_HEADERS_ONCE(utmp.h utmpx.h)
   AC_CHECK_FUNCS_ONCE(utmpname utmpxname)
   AC_CHECK_DECLS(getutent,,,[

diff --git a/modules/readutmp b/modules/readutmp
index 48014ac79fb493208d161d565b8d3099f7e44491..8c4f84747db0f27c054f04bf4e6ab8ad483cb1a8 100644 (file)
--- a/modules/readutmp
+++ b/modules/readutmp
@@ -23,4 +23,4 @@ License:
 GPL
 
 Maintainer:
-Jim Meyering
+Jim Meyering & Paul Eggert

diff --git a/modules/strtok_r b/modules/strtok_r
index 32134ba074dcd8721260295d529f9df3288458b4..92aa8eb91d0376760bafb0a6a89ccd992fdc38d8 100644 (file)
--- a/modules/strtok_r
+++ b/modules/strtok_r
@@ -7,6 +7,7 @@ lib/strtok_r.h
 m4/strtok_r.m4
 
 Depends-on:
+restrict
 
 configure.ac:
 gl_FUNC_STRTOK_R