changeset 5721:abd018cd6020

Use AC_LIBSOURCES and AC_LIBOBJ to indicate source and object files.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 21 Mar 2005 22:06:27 +0000
parents ede3ed186ac0
children adf2be655aae
files m4/ChangeLog m4/acl.m4 m4/backupfile.m4 m4/c-strtod.m4 m4/canon-host.m4 m4/canonicalize.m4 m4/cloexec.m4 m4/closeout.m4 m4/dirfd.m4 m4/dirname.m4 m4/exclude.m4 m4/exitfail.m4 m4/file-type.m4 m4/filemode.m4 m4/fpending.m4 m4/fsusage.m4 m4/getcwd.m4 m4/getdate.m4 m4/getline.m4 m4/getpagesize.m4 m4/getpass.m4 m4/getugroups.m4 m4/group-member.m4 m4/hard-locale.m4 m4/hash.m4 m4/human.m4 m4/idcache.m4 m4/inttostr.m4 m4/long-options.m4 m4/makepath.m4 m4/md5.m4 m4/memcasecmp.m4 m4/memcoll.m4 m4/modechange.m4 m4/mountlist.m4 m4/nanosleep.m4 m4/path-concat.m4 m4/pathmax.m4 m4/physmem.m4 m4/posixtm.m4 m4/posixver.m4 m4/quote.m4 m4/quotearg.m4 m4/readtokens.m4 m4/readutmp.m4 m4/safe-read.m4 m4/safe-write.m4 m4/same.m4 m4/savedir.m4 m4/settime.m4 m4/sha1.m4 m4/sig2str.m4 m4/strdup.m4 m4/strftime.m4 m4/strndup.m4 m4/strverscmp.m4 m4/timespec.m4 m4/unlocked-io.m4 m4/userspec.m4 m4/utimecmp.m4 m4/utimens.m4 m4/xalloc.m4 m4/xnanosleep.m4 m4/xstrtol.m4 m4/yesno.m4
diffstat 65 files changed, 334 insertions(+), 125 deletions(-) [+]
line wrap: on
line diff
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,27 @@
+2005-03-21  Jim Meyering  <jim@meyering.net>
+       and  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* acl.m4, backupfile.m4, c-strtod.m4, canon-host.m4, canonicalize.m4,
+	cloexec.m4, closeout.m4, dirfd.m4, dirname.m4, exclude.m4,
+	exitfail.m4, file-type.m4, filemode.m4, fpending.m4, fsusage.m4,
+	getcwd.m4, getdate.m4, getline.m4, getpagesize.m4, getpass.m4,
+	getugroups.m4, group-member.m4, hard-locale.m4, hash.m4, human.m4,
+	idcache.m4, inttostr.m4, long-options.m4, makepath.m4, md5.m4,
+	memcasecmp.m4, memcoll.m4, modechange.m4, mountlist.m4, nanosleep.m4,
+	path-concat.m4, pathmax.m4, physmem.m4, posixtm.m4, posixver.m4,
+	quote.m4, quotearg.m4, readtokens.m4, readutmp.m4, safe-read.m4,
+	safe-write.m4, same.m4, savedir.m4, settime.m4, sha1.m4, sig2str.m4,
+	strdup.m4, strftime.m4, strndup.m4, strverscmp.m4, timespec.m4,
+	unlocked-io.m4, userspec.m4, utimecmp.m4, utimens.m4, xalloc.m4,
+	xnanosleep.m4, xstrtol.m4, yesno.m4:
+	Use AC_LIBSOURCES and AC_LIBOBJ to indicate source and object files
+	for these modules.
+
+2005-03-21  Jim Meyering  <jim@meyering.net>
+
+	* chdir-long.m4 (gl_PREREQ_CHDIR_LONG): Invoke gl_FUNC_MEMRCHR.
+	* memrchr.m4 (gl_FUNC_MEMRCHR): Check for memrchr decl.
+
 2005-03-16  Bruno Haible  <bruno@clisp.org>
 
 	* stdint.m4 (gl_STDINT_H): Define HAVE_LONG_LONG_64BIT instead of
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,6 +1,6 @@
 # acl.m4 - check for access control list (ACL) primitives
 
-# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,9 @@
 
 AC_DEFUN([AC_FUNC_ACL],
 [
+  AC_LIBSOURCES([acl.c, acl.h])
+  AC_LIBOBJ([acl])
+
   dnl Prerequisites of lib/acl.c.
   AC_CHECK_HEADERS(sys/acl.h)
   AC_CHECK_FUNCS(acl)
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,11 +1,14 @@
-# backupfile.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# backupfile.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_BACKUPFILE],
 [
+  AC_LIBSOURCES([backupfile.c, backupfile.h])
+  AC_LIBOBJ([backupfile])
+
   dnl Prerequisites of lib/backupfile.c.
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,6 +1,6 @@
-# c-strtod.m4 serial 5
+# c-strtod.m4 serial 6
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,6 +35,9 @@
 
 AC_DEFUN([gl_C_STRTOD],
 [
+  AC_LIBSOURCES([c-strtod.c, c-strtod.h])
+  AC_LIBOBJ([c-strtod])
+
   dnl Prerequisites of lib/c-strtod.c.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   :
@@ -42,6 +45,9 @@
 
 AC_DEFUN([gl_C_STRTOLD],
 [
+  AC_LIBSOURCES([c-strtold.c, c-strtod.h])
+  AC_LIBOBJ([c-strtold])
+
   dnl Prerequisites of lib/c-strtold.c.
   AC_REQUIRE([gl_C_STRTOD])
   AC_REQUIRE([gl_C99_STRTOLD])
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,11 +1,14 @@
-# canon-host.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# canon-host.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_CANON_HOST],
 [
+  AC_LIBSOURCES([canon-host.c])
+  AC_LIBOBJ([canon-host])
+
   dnl Prerequisites of lib/canon-host.c.
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS(netdb.h sys/socket.h netinet/in.h arpa/inet.h)
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,6 +1,6 @@
-#serial 4
+#serial 6
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,9 @@
 
 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
+    AC_LIBSOURCES([canonicalize.c, canonicalize.h, stat-macros.h])
+    AC_LIBOBJ([canonicalize])
+
     AC_REQUIRE([AC_HEADER_STDC])
     AC_CHECK_HEADERS(string.h sys/param.h stddef.h)
     AC_CHECK_FUNCS(resolvepath canonicalize_file_name)
--- a/m4/cloexec.m4
+++ b/m4/cloexec.m4
@@ -1,11 +1,14 @@
-# cloexec.m4 serial 2
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+# cloexec.m4 serial 3
+dnl Copyright (C) 2004, 2005 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.
 
 AC_DEFUN([gl_CLOEXEC],
 [
+  AC_LIBSOURCES([cloexec.c, cloexec.h])
+  AC_LIBOBJ([cloexec])
+
   dnl Prerequisites of lib/cloexec.c.
   AC_CHECK_HEADERS_ONCE(fcntl.h unistd.h)
 ])
--- a/m4/closeout.m4
+++ b/m4/closeout.m4
@@ -1,11 +1,14 @@
-# closeout.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# closeout.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_CLOSEOUT],
 [
+  AC_LIBSOURCES([closeout.c, closeout.h])
+  AC_LIBOBJ([closeout])
+
   dnl Prerequisites of lib/closeout.c.
   :
 ])
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,8 +1,8 @@
-#serial 9
+#serial 10
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,8 @@
 
 AC_DEFUN([gl_FUNC_DIRFD],
 [
+  AC_LIBSOURCES([dirfd.c, dirfd.h])
+
   dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
   AC_REQUIRE([AC_PROG_CPP])
   AC_REQUIRE([AC_PROG_EGREP])
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,11 +1,14 @@
-# dirname.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# dirname.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_DIRNAME],
 [
+  AC_LIBSOURCES([dirname.c, dirname.h])
+  AC_LIBOBJ([dirname])
+
   dnl Prerequisites of lib/dirname.h.
   AC_REQUIRE([gl_AC_DOS])
 
--- a/m4/exclude.m4
+++ b/m4/exclude.m4
@@ -1,11 +1,14 @@
-# exclude.m4 serial 4
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# exclude.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_EXCLUDE],
 [
+  AC_LIBSOURCES([exclude.c, exclude.h])
+  AC_LIBOBJ([exclude])
+
   dnl Prerequisites of lib/exclude.c.
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_HEADER_STDC])
--- a/m4/exitfail.m4
+++ b/m4/exitfail.m4
@@ -1,11 +1,14 @@
-# exitfail.m4 serial 4
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# exitfail.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_EXITFAIL],
 [
+  AC_LIBSOURCES([exitfail.c, exitfail.h])
+  AC_LIBOBJ([exitfail])
+
   dnl No prerequisites of lib/exitfail.c.
   :
 ])
--- a/m4/file-type.m4
+++ b/m4/file-type.m4
@@ -1,11 +1,14 @@
-# file-type.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# file-type.m4 serial 4
+dnl Copyright (C) 2002, 2005 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.
 
 AC_DEFUN([gl_FILE_TYPE],
 [
+  AC_LIBSOURCES([file-type.c, file-type.h, stat-macros.h])
+  AC_LIBOBJ([file-type])
+
   dnl Prerequisites of lib/file-type.h.
   AC_REQUIRE([AC_HEADER_STAT])
 ])
--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,11 +1,14 @@
-# filemode.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# filemode.m4 serial 4
+dnl Copyright (C) 2002, 2005 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.
 
 AC_DEFUN([gl_FILEMODE],
 [
+  AC_LIBSOURCES([filemode.c, filemode.h, stat-macros.h])
+  AC_LIBOBJ([filemode])
+
   dnl Prerequisites of lib/filemode.c.
   AC_REQUIRE([AC_HEADER_STAT])
 ])
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,6 +1,6 @@
-#serial 5
+#serial 6
 
-# Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,8 @@
 
 AC_DEFUN([gl_FUNC_FPENDING],
 [
+  AC_LIBSOURCES([__fpending.c, __fpending.h])
+
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
   fp_headers='
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,7 +1,7 @@
-# fsusage.m4 serial 14
+# fsusage.m4 serial 15
 # Obtaining file system usage information.
 
-# Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004 Free Software
+# Copyright (C) 1997, 1998, 2000, 2001, 2003, 2004, 2005 Free Software
 # Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -12,6 +12,8 @@
 
 AC_DEFUN([gl_FSUSAGE],
 [
+  AC_LIBSOURCES([fsusage.c, fsusage.h])
+
   AC_CHECK_HEADERS_ONCE(sys/param.h)
   AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h)
   AC_CHECK_HEADERS(sys/mount.h, [], [],
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -1,6 +1,6 @@
 # getcwd.m4 - check for working getcwd that is compatible with glibc
 
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,8 @@
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
+   AC_LIBSOURCES([getcwd.c, getcwd.h])
+
    AC_CHECK_HEADERS_ONCE(unistd.h)
    AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result],
      [gl_cv_func_getcwd_null],
--- a/m4/getdate.m4
+++ b/m4/getdate.m4
@@ -1,11 +1,14 @@
-# getdate.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# getdate.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_GETDATE],
 [
+  AC_LIBSOURCES([getdate.h, getdate.y])
+  AC_LIBOBJ([getdate])
+
   dnl Prerequisites of lib/getdate.h.
   AC_REQUIRE([AM_STDBOOL_H])
   AC_REQUIRE([gl_TIMESPEC])
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,6 +1,6 @@
-# getline.m4 serial 11
+# getline.m4 serial 12
 
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 Free Software
 dnl Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
@@ -15,6 +15,8 @@
 dnl to do with the function we need.
 AC_DEFUN([AM_FUNC_GETLINE],
 [
+  AC_LIBSOURCES([getline.c, getline.h])
+
   dnl Persuade glibc <stdio.h> to declare getline() and getdelim().
   AC_REQUIRE([AC_GNU_SOURCE])
 
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,11 +1,13 @@
-# getpagesize.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# getpagesize.m4 serial 4
+dnl Copyright (C) 2002, 2004, 2005 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.
 
 AC_DEFUN([gl_GETPAGESIZE],
 [
+  AC_LIBSOURCES([getpagesize.h])
+
   dnl Prerequisites of lib/getpagesize.h.
   AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
   AC_CHECK_HEADERS(OS.h)
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,5 +1,5 @@
-# getpass.m4 serial 5
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# getpass.m4 serial 6
+dnl Copyright (C) 2002-2003, 2005 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.
@@ -18,6 +18,8 @@
 # arbitrary length (not just 8 bytes as on HP-UX).
 AC_DEFUN([gl_FUNC_GETPASS_GNU],
 [
+  AC_LIBSOURCES([getpass.c, getpass.h])
+
   AC_CHECK_DECLS_ONCE(getpass)
   dnl TODO: Detect when GNU getpass() is already found in glibc.
   AC_LIBOBJ(getpass)
--- a/m4/getugroups.m4
+++ b/m4/getugroups.m4
@@ -1,11 +1,14 @@
-# getugroups.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# getugroups.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_GETUGROUPS],
 [
+  AC_LIBSOURCES([getugroups.c])
+  AC_LIBOBJ([getugroups])
+
   dnl Prerequisites of lib/getugroups.c.
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_TYPE_GETGROUPS
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,6 +1,6 @@
-#serial 7
+#serial 8
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,8 @@
 
 AC_DEFUN([gl_FUNC_GROUP_MEMBER],
 [
+  AC_LIBSOURCES([group-member.c, group-member.h])
+
   dnl Persuade glibc <unistd.h> to declare group_member().
   AC_REQUIRE([AC_GNU_SOURCE])
 
--- a/m4/hard-locale.m4
+++ b/m4/hard-locale.m4
@@ -1,8 +1,12 @@
-# hard-locale.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# hard-locale.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 dnl No prerequisites of lib/hard-locale.c.
-AC_DEFUN([gl_HARD_LOCALE], [:])
+AC_DEFUN([gl_HARD_LOCALE],
+[
+  AC_LIBSOURCES([hard-locale.c, hard-locale.h])
+  AC_LIBOBJ([hard-locale])
+])
--- a/m4/hash.m4
+++ b/m4/hash.m4
@@ -1,11 +1,14 @@
-# hash.m4 serial 4
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# hash.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_HASH],
 [
+  AC_LIBSOURCES([hash.c, hash.h])
+  AC_LIBOBJ([hash])
+
   dnl Prerequisites of lib/hash.c.
   AC_REQUIRE([AM_STDBOOL_H])
 ])
--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,11 +1,14 @@
-# human.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+#serial 9
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_HUMAN],
 [
+  AC_LIBSOURCES([human.c, human.h, intprops.h])
+  AC_LIBOBJ([human])
+
   dnl Prerequisites of lib/human.h.
   AC_REQUIRE([AM_STDBOOL_H])
   AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
--- a/m4/idcache.m4
+++ b/m4/idcache.m4
@@ -1,11 +1,14 @@
-# idcache.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# idcache.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_IDCACHE],
 [
+  AC_LIBSOURCES([idcache.c])
+  AC_LIBOBJ([idcache])
+
   dnl Prerequisites of lib/idcache.c.
   AC_CHECK_HEADERS_ONCE(unistd.h)
 ])
--- a/m4/inttostr.m4
+++ b/m4/inttostr.m4
@@ -1,11 +1,22 @@
-# inttostr.m4 serial 3
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+#serial 5
+dnl Copyright (C) 2004, 2005 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.
 
 AC_DEFUN([gl_INTTOSTR],
 [
+  AC_LIBSOURCES([inttostr.c, inttostr.h, intprops.h])
+
+  dnl We don't technically need to list the following .c files, since their
+  dnl functions are named in the AC_LIBOBJ calls, but this is an unusual
+  dnl module and it seems a little clearer to do so.
+  AC_LIBSOURCES([imaxtostr.c, offtostr.c, umaxtostr.c])
+
+  AC_LIBOBJ([imaxtostr])
+  AC_LIBOBJ([offtostr])
+  AC_LIBOBJ([umaxtostr])
+
   gl_PREREQ_INTTOSTR
   gl_PREREQ_IMAXTOSTR
   gl_PREREQ_OFFTOSTR
--- a/m4/long-options.m4
+++ b/m4/long-options.m4
@@ -1,11 +1,13 @@
-# long-options.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# long-options.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_LONG_OPTIONS],
 [
+  AC_LIBSOURCES([long-options.c, long-options.h])
+  AC_LIBOBJ([long-options])
+
   dnl Prerequisites of lib/long-options.c.
-  :
 ])
--- a/m4/makepath.m4
+++ b/m4/makepath.m4
@@ -1,11 +1,14 @@
-# makepath.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# makepath.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_MAKEPATH],
 [
+  AC_LIBSOURCES([makepath.c, makepath.h, stat-macros.h])
+  AC_LIBOBJ([makepath])
+
   dnl Prerequisites of lib/makepath.c.
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_CHECK_HEADERS_ONCE(unistd.h)
--- a/m4/md5.m4
+++ b/m4/md5.m4
@@ -1,11 +1,14 @@
-# md5.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# md5.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_MD5],
 [
+  AC_LIBSOURCES([md5.c, md5.h])
+  AC_LIBOBJ([md5])
+
   dnl Prerequisites of lib/md5.h.
   AC_REQUIRE([gl_AC_TYPE_UINT32_T])
 
--- a/m4/memcasecmp.m4
+++ b/m4/memcasecmp.m4
@@ -1,11 +1,14 @@
-# memcasecmp.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+#serial 3
+dnl Copyright (C) 2005 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.
 
 AC_DEFUN([gl_MEMCASECMP],
 [
+  AC_LIBSOURCES([memcasecmp.c, memcasecmp.h])
+  AC_LIBOBJ([memcasecmp])
+
   dnl Prerequisites of lib/memcasecmp.c.
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_FUNCS_ONCE(isascii)
--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,11 +1,14 @@
-# memcoll.m4 serial 4
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# memcoll.m4 serial 5
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_MEMCOLL],
 [
+  AC_LIBSOURCES([memcoll.c, memcoll.h])
+  AC_LIBOBJ([memcoll])
+
   dnl Prerequisites of lib/memcoll.c.
   AC_REQUIRE([AC_FUNC_MEMCMP])
   AC_FUNC_STRCOLL
--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,10 +1,13 @@
-# modechange.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# modechange.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_MODECHANGE],
 [
+  AC_LIBSOURCES([modechange.c, modechange.h])
+  AC_LIBOBJ([modechange])
+
   AC_REQUIRE([AC_HEADER_STAT])
 ])
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,11 +1,13 @@
-# mountlist.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# mountlist.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_MOUNTLIST],
 [
+  AC_LIBSOURCES([mountlist.c, mountlist.h])
+
   gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes],
 			       [gl_cv_list_mounted_fs=no])
   if test $gl_cv_list_mounted_fs = yes; then
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,17 +1,19 @@
-#serial 11
+#serial 12
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_NANOSLEEP],
 [
+ AC_LIBSOURCES([nanosleep.c])
+
  nanosleep_save_libs=$LIBS
 
  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
--- a/m4/path-concat.m4
+++ b/m4/path-concat.m4
@@ -1,11 +1,14 @@
-# path-concat.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# path-concat.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_PATH_CONCAT],
 [
+  AC_LIBSOURCES([path-concat.c, path-concat.h])
+  AC_LIBOBJ([path-concat])
+
   dnl Prerequisites of lib/path-concat.c.
   AC_CHECK_FUNCS_ONCE(mempcpy)
 ])
--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,11 +1,13 @@
-# pathmax.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# pathmax.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_PATHMAX],
 [
+  AC_LIBSOURCES([pathmax.h])
+
   dnl Prerequisites of lib/pathmax.h.
   AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
 ])
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,5 +1,5 @@
-# physmem.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# physmem.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
@@ -26,6 +26,9 @@
 
 AC_DEFUN([gl_PHYSMEM],
 [
+  AC_LIBSOURCES([physmem.c, physmem.h])
+  AC_LIBOBJ([physmem])
+
   # Prerequisites of lib/physmem.c.
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS([sys/pstat.h sys/sysmp.h sys/sysinfo.h \
--- a/m4/posixtm.m4
+++ b/m4/posixtm.m4
@@ -1,11 +1,14 @@
-# posixtm.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# posixtm.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_POSIXTM],
 [
+  AC_LIBSOURCES([posixtm.c, posixtm.h])
+  AC_LIBOBJ(posixtm)
+
   dnl Prerequisites of lib/posixtm.c.
   AC_STRUCT_TM
 ])
--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -1,11 +1,14 @@
-# posixver.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# posixver.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_POSIXVER],
 [
+  AC_LIBSOURCES([posixver.c, posixver.h])
+  AC_LIBOBJ([posixver])
+
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_REQUIRE([gl_DEFAULT_POSIX2_VERSION])
 ])
--- a/m4/quote.m4
+++ b/m4/quote.m4
@@ -1,11 +1,14 @@
-# quote.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# quote.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_QUOTE],
 [
+  AC_LIBSOURCES([quote.c, quote.h])
+  AC_LIBOBJ([quote])
+
   dnl Prerequisites of lib/quote.c.
   dnl (none)
 ])
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,11 +1,14 @@
-# quotearg.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# quotearg.m4 serial 4
+dnl Copyright (C) 2002, 2004, 2005 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.
 
 AC_DEFUN([gl_QUOTEARG],
 [
+  AC_LIBSOURCES([quotearg.c, quotearg.h])
+  AC_LIBOBJ([quotearg])
+
   dnl Prerequisites of lib/quotearg.c.
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
   AC_CHECK_FUNCS_ONCE(iswprint mbsinit)
--- a/m4/readtokens.m4
+++ b/m4/readtokens.m4
@@ -1,11 +1,14 @@
-# readtokens.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# readtokens.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_READTOKENS],
 [
+  AC_LIBSOURCES([readtokens.c, readtokens.h])
+  AC_LIBOBJ([readtokens])
+
   dnl Prerequisites of lib/readtokens.c.
   :
 ])
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,11 +1,14 @@
-# readutmp.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# readutmp.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_READUTMP],
 [
+  AC_LIBSOURCES([readutmp.c, readutmp.h])
+  AC_LIBOBJ([readutmp])
+
   dnl Prerequisites of lib/readutmp.h.
   AC_CHECK_HEADERS(utmp.h utmpx.h)
   AC_CHECK_FUNCS(utmpname utmpxname)
--- a/m4/safe-read.m4
+++ b/m4/safe-read.m4
@@ -1,11 +1,14 @@
-# safe-read.m4 serial 2
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# safe-read.m4 serial 3
+dnl Copyright (C) 2002-2003, 2005 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.
 
 AC_DEFUN([gl_SAFE_READ],
 [
+  AC_LIBSOURCES([safe-read.c, safe-read.h])
+  AC_LIBOBJ([safe-read])
+
   gl_PREREQ_SAFE_READ
 ])
 
--- a/m4/safe-write.m4
+++ b/m4/safe-write.m4
@@ -1,11 +1,14 @@
-# safe-write.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# safe-write.m4 serial 2
+dnl Copyright (C) 2002, 2005 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.
 
 AC_DEFUN([gl_SAFE_WRITE],
 [
+  AC_LIBSOURCES([safe-write.c, safe-write.h])
+  AC_LIBOBJ([safe-write])
+
   gl_PREREQ_SAFE_WRITE
 ])
 
--- a/m4/same.m4
+++ b/m4/same.m4
@@ -1,11 +1,14 @@
-# same.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# same.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_SAME],
 [
+  AC_LIBSOURCES([same.c, same.h])
+  AC_LIBOBJ([same])
+
   dnl Prerequisites of lib/same.c.
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_FUNCS(pathconf)
--- a/m4/savedir.m4
+++ b/m4/savedir.m4
@@ -1,11 +1,14 @@
-# savedir.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# savedir.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_SAVEDIR],
 [
+  AC_LIBSOURCES([savedir.c, savedir.h])
+  AC_LIBOBJ([savedir])
+
   dnl Prerequisites of lib/savedir.c.
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
--- a/m4/settime.m4
+++ b/m4/settime.m4
@@ -1,11 +1,14 @@
-# settime.m4 serial 3
-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# settime.m4 serial 4
+dnl Copyright (C) 2002, 2004, 2005 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.
 
 AC_DEFUN([gl_SETTIME],
 [
+  AC_LIBSOURCES([settime.c])
+  AC_LIBOBJ([settime])
+
   dnl Prerequisites of lib/settime.c.
   AC_REQUIRE([gl_CLOCK_TIME])
   AC_REQUIRE([gl_TIMESPEC])
--- a/m4/sha1.m4
+++ b/m4/sha1.m4
@@ -1,11 +1,14 @@
-# sha1.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# sha1.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_SHA1],
 [
+  AC_LIBSOURCES([sha1.c, sha1.h])
+  AC_LIBOBJ([sha1])
+
   dnl Prerequisites of lib/sha1.c.
   AC_REQUIRE([AC_C_BIGENDIAN])
   :
--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,11 +1,13 @@
-# sig2str.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+#serial 4
+dnl Copyright (C) 2002, 2005 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.
 
 AC_DEFUN([gl_FUNC_SIG2STR],
 [
+  AC_LIBSOURCES([sig2str.c, sig2str.h, intprops.h])
+
   AC_REPLACE_FUNCS(sig2str)
   if test $ac_cv_func_sig2str = no; then
     gl_PREREQ_SIG2STR
--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,11 +1,13 @@
-# strdup.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# strdup.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_FUNC_STRDUP],
 [
+  AC_LIBSOURCES([strdup.c, strdup.h])
+
   AC_REPLACE_FUNCS(strdup)
   AC_CHECK_DECLS_ONCE(strdup)
   gl_PREREQ_STRDUP
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,6 +1,6 @@
 #serial 24
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -17,6 +17,9 @@
 # These are the prerequisite macros for GNU's strftime.c replacement.
 AC_DEFUN([gl_FUNC_STRFTIME],
 [
+ AC_LIBSOURCES([strftime.c, strftime.h])
+ AC_LIBOBJ([strftime])
+
  # strftime.c uses the underyling system strftime if it exists.
  AC_REQUIRE([AC_FUNC_STRFTIME])
 
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,11 +1,13 @@
-# strndup.m4 serial 3
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# strndup.m4 serial 4
+dnl Copyright (C) 2002, 2003, 2005 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.
 
 AC_DEFUN([gl_FUNC_STRNDUP],
 [
+  AC_LIBSOURCES([strndup.c, strndup.h])
+
   dnl Persuade glibc <string.h> to declare strndup().
   AC_REQUIRE([AC_GNU_SOURCE])
 
--- a/m4/strverscmp.m4
+++ b/m4/strverscmp.m4
@@ -1,11 +1,13 @@
-# strverscmp.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# strverscmp.m4 serial 3
+dnl Copyright (C) 2002, 2005 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.
 
 AC_DEFUN([gl_FUNC_STRVERSCMP],
 [
+  AC_LIBSOURCES([strverscmp.c, strverscmp.h])
+
   dnl Persuade glibc <string.h> to declare strverscmp().
   AC_REQUIRE([AC_GNU_SOURCE])
 
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,6 +1,6 @@
-#serial 9
+#serial 10
 
-# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,8 @@
 
 AC_DEFUN([gl_TIMESPEC],
 [
+  AC_LIBSOURCES([timespec.h])
+
   dnl Prerequisites of lib/timespec.h.
   AC_REQUIRE([AC_HEADER_TIME])
   AC_CHECK_HEADERS_ONCE(sys/time.h)
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,6 +1,6 @@
-# unlocked-io.m4 serial 11
+# unlocked-io.m4 serial 12
 
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
 # Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -17,6 +17,8 @@
 
 AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
 [
+  AC_LIBSOURCES([unlocked-io.h])
+
   AC_DEFINE([USE_UNLOCKED_IO], 1,
     [Define to 1 if you want getc etc. to use unlocked I/O if available.
      Unlocked I/O can improve performance in unithreaded apps,
--- a/m4/userspec.m4
+++ b/m4/userspec.m4
@@ -1,11 +1,14 @@
-# userspec.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+#serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_USERSPEC],
 [
+  AC_LIBSOURCES([userspec.c, userspec.h, intprops.h])
+  AC_LIBOBJ([userspec])
+
   dnl Prerequisites of lib/userspec.c.
   AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
 ])
--- a/m4/utimecmp.m4
+++ b/m4/utimecmp.m4
@@ -1,10 +1,14 @@
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+#serial 1
+dnl Copyright (C) 2004, 2005 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.
 
 AC_DEFUN([gl_UTIMECMP],
 [
+  AC_LIBSOURCES([utimecmp.c, utimecmp.h, intprops.h])
+  AC_LIBOBJ([utimecmp])
+
   dnl Prerequisites of lib/utimecmp.c.
   AC_REQUIRE([gl_TIMESPEC])
   AC_REQUIRE([gl_FUNC_UTIMES])
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -1,10 +1,13 @@
-dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_UTIMENS],
 [
+  AC_LIBSOURCES([utimens.c, utimens.h])
+  AC_LIBOBJ([utimens])
+
   dnl Prerequisites of lib/utimens.c.
   AC_REQUIRE([gl_TIMESPEC])
   AC_REQUIRE([gl_FUNC_UTIMES])
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,11 +1,14 @@
-# xalloc.m4 serial 11
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# xalloc.m4 serial 12
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_XALLOC],
 [
+  AC_LIBSOURCES([xmalloc.c, xalloc.h])
+  AC_LIBOBJ([xmalloc])
+
   gl_PREREQ_XALLOC
   gl_PREREQ_XMALLOC
 ])
--- a/m4/xnanosleep.m4
+++ b/m4/xnanosleep.m4
@@ -1,4 +1,4 @@
-# xnanosleep.m4 serial 2
+#serial 3
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,6 +8,6 @@
 
 AC_DEFUN([gl_XNANOSLEEP],
 [
-  AC_LIBSOURCES([xnanosleep.c, xnanosleep.h])
+  AC_LIBSOURCES([xnanosleep.c, xnanosleep.h, intprops.h])
   AC_LIBOBJ([xnanosleep])
 ])
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,11 +1,15 @@
-# xstrtol.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+#serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2005 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.
 
 AC_DEFUN([gl_XSTRTOL],
 [
+  AC_LIBSOURCES([xstrtol.c, xstrtol.h, xstrtoul.c, intprops.h])
+  AC_LIBOBJ([xstrtol])
+  AC_LIBOBJ([xstrtoul])
+
   AC_REQUIRE([gl_PREREQ_XSTRTOL])
   AC_REQUIRE([gl_PREREQ_XSTRTOUL])
 ])
--- a/m4/yesno.m4
+++ b/m4/yesno.m4
@@ -1,11 +1,14 @@
-# yesno.m4 serial 3
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# yesno.m4 serial 4
+dnl Copyright (C) 2002-2003, 2005 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.
 
 AC_DEFUN([gl_YESNO],
 [
+  AC_LIBSOURCES([yesno.c, yesno.h])
+  AC_LIBOBJ([yesno])
+
   dnl No prerequisites of lib/yesno.c.
   :
 ])