Avoid the need for AC_LIBSOURCES in m4 macros.

* modules/acl (EXTRA_DIST): Add acl.h.
* modules/argmatch (Files): Add m4/argmatch.m4.
(configure.ac): Add gl_ARGMATCH.
(EXTRA_DIST): Renamed from lib_SOURCES, for
consistency with the other modules.  Remove argmatch.c.
* modules/backupfile (EXTRA_DIST): Add backupfile.h.
* modules/c-strtod (EXTRA_DIST): Add c-strtod.h.
* modules/c-strtold (EXTRA_DIST): Add c-strtod.c, c-strtod.h.
* modules/canonhost (EXTRA_DIST): Add c-canonhost.h.
* modules/canonicalize (EXTRA_DIST): Add canonicalize.h.
* modules/chdir-long (EXTRA_DIST): Add chdir-long.h.
* modules/chdir-safer (EXTRA_DIST): Add chdir-safer.h.
* modules/cloexec (EXTRA_DIST): Add cloexec.h.
* modules/close-stream (EXTRA_DIST): Add close-stream.h.
* modules/closeout (EXTRA_DIST): Add closeout.h.
* modules/cycle-check (EXTRA_DIST): Add cycle-check.h.
* modules/dev-ino (EXTRA_DIST): Add dev-ino.h.
* modules/dirfd (EXTRA_DIST): Add dirfd.h.
* modules/dirname (EXTRA_DIST): Renamed from lib_SOURCES.  Add
dirname.h; remove basename.c and stripslash.c.
* modules/exclude (EXTRA_DIST): Add exclude.h.
* modules/exitfail (EXTRA_DIST): Add exitfail.h.
* modules/fcntl-safer (EXTRA_DIST): Add fcntl-safer.h fcntl--.h.
* modules/file-type (EXTRA_DIST): Add file-type.h.
* modules/filemode (EXTRA_DIST): Add filemode.h.
* modules/filenamecat (EXTRA_DIST): Add filenamecat.h.
* modules/fopen-safer (EXTRA_DIST): Add stdio-safer.h stdio--.h.
* modules/fpending (EXTRA_DIST): Add __fpending.h.
* modules/fprintftime (EXTRA_DIST): Add fprintftime.h.
* modules/fsusage (EXTRA_DIST): Add fsusage.h.
* modules/fts (EXTRA_DIST): Add fts_.h fts-cycle.c.
* modules/getcwd (EXTRA_DIST): Add getcwd.h.
* modules/getdate (EXTRA_DIST): Add getdate.c.
* modules/gethrxtime (EXTRA_DIST): Add gethrxtime.h xtime.h.
* modules/getpagesize (EXTRA_DIST): Add getpagesize.h.
* modules/getpass (EXTRA_DIST): Add getpass.h.
* modules/glob (EXTRA_DIST): Add glob_.h glob-libc.h.
* modules/group-member (EXTRA_DIST): Add group-member.h.
* modules/hard-locale (EXTRA_DIST): Add hard-locale.h.
* modules/hash (EXTRA_DIST): Add hash.h.
* modules/human (EXTRA_DIST): Add human.h.
* modules/inttypes (EXTRA_DIST): Add inttypes.h.
* modules/lchmod (EXTRA_DIST): Add lchmod.h.
* modules/lchown (EXTRA_DIST): Add lchown.h.
* modules/long-options (EXTRA_DIST): Add long-options.h.
* modules/lstat (EXTRA_DIST): Add lstat.h.
* modules/md5 (EXTRA_DIST): Add memcasecmp.h.
* modules/memcoll (EXTRA_DIST): Add memcoll.h.
* modules/mempcpy (EXTRA_DIST): Add mempcpy.h.
* modules/memrchr (EXTRA_DIST): Add memrchr.h.
* modules/memxor (EXTRA_DIST): Add memxor.h.
* modules/mkancesdirs (EXTRA_DIST): Add mkancesdirs.h.
* modules/mkdir-p (EXTRA_DIST): Add modechange.h.
* modules/mountlist (EXTRA_DIST): Add mountlist.h.
* modules/openat (EXTRA_DIST): Add at-func.c openat.h openat-priv.h.
* modules/pathmax (EXTRA_DIST): Add pathmax.h.
* modules/physmem (EXTRA_DIST): Add physmem.h.
* modules/posixtm (EXTRA_DIST): Add posixtm.h.
* modules/posixver (EXTRA_DIST): Add posixver.h.
* modules/quote (EXTRA_DIST): Add quote.h.
* modules/quotearg (EXTRA_DIST): Add quotearg.h.
* modules/readtokens (EXTRA_DIST): Add readtokens.h.
* modules/readutmp (EXTRA_DIST): Add readutmp.h.
* modules/regex (EXTRA_DIST): Add regcomp.c regex.h regex_internal.c regex_internal.h regexec.c.
* modules/safe-read (EXTRA_DIST): Add safe-read.h.
* modules/safe-write (EXTRA_DIST): Add safe-write.h.
* modules/same (EXTRA_DIST): Add same.h.
* modules/same-inode (EXTRA_DIST): Add same-inode.h.
* modules/save-cwd (EXTRA_DIST): Add save-cwd.h.
* modules/savedir (EXTRA_DIST): Add savedir.h.
* modules/sha1 (EXTRA_DIST): Add sha1.h.
* modules/sig2str (EXTRA_DIST): Add sig2str.h.
* modules/stat-macros (EXTRA_DIST): Add stat-macros.h.
* modules/stat-time (EXTRA_DIST): Add stat-time.h.
* modules/stdlib-safer (EXTRA_DIST): Add stdlib-safer.h stdlib--.h.
* modules/strdup (EXTRA_DIST): Add strdup.h.
* modules/strftime (EXTRA_DIST): Add strftime.h.
* modules/strndup (EXTRA_DIST): Add strndup.h.
* modules/strnlen (EXTRA_DIST): Add strnlen.h.
* modules/strverscmp (EXTRA_DIST): Add strverscmp.h.
* modules/time_r (EXTRA_DIST): Add time_r.h.
* modules/timespec (EXTRA_DIST): Add timespec.h.
* modules/tmpfile-safer (EXTRA_DIST): Add stdio-safer.h stdio--.h.
* modules/unistd-safer (EXTRA_DIST): Add unistd-safer.h unistd--.h.
* modules/unlinkdir (EXTRA_DIST): Add unlinkdir.h.
* modules/unlocked-io (EXTRA_DIST): Add unlocked-io.h.
* modules/userspec (EXTRA_DIST): Add userspec.h.
* modules/utimecmp (EXTRA_DIST): Add utimecmp.h.
* modules/utimens (EXTRA_DIST): Add utimens.h.
* modules/xalloc (EXTRA_DIST): Add xalloc.h.
* modules/xgetcwd (EXTRA_DIST): Add xgetcwd.h.
* modules/xnanosleep (EXTRA_DIST): Add xnanosleep.h.
* modules/xreadlink (EXTRA_DIST): Add xreadlink.h.
* modules/xstrtod (EXTRA_DIST): Add xstrtod.h.
* modules/xstrtol (EXTRA_DIST): Add xstrtol.h.
* modules/xstrtold (EXTRA_DIST): Add xstrtod.c xstrtod.h.
* modules/yesno (EXTRA_DIST): Add yesno.h.
+
* m4/argmatch.m4: New file, from coreutils with AC_LIBSOURCES removed.
* m4/dev-ino.m4, same-inode.m4: Remove.
+
* m4/_inttypes_h.m4 (gl_INTTYPES_H):
* m4/acl.m4 (AC_FUNC_ACL):
* m4/backupfile.m4 (gl_BACKUPFILE):
* m4/c-strtod.m4 (gl_C99_STRTOLD):
* m4/canon-host.m4 (gl_CANON_HOST):
* m4/canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME):
* m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG):
* m4/chdir-safer.m4 (gl_CHDIR_SAFER):
* m4/cloexec.m4 (gl_CLOEXEC):
* m4/close-stream.m4 (gl_CLOSE_STREAM):
* m4/closeout.m4 (gl_CLOSEOUT):
* m4/dirfd.m4 (gl_FUNC_DIRFD):
* m4/dirname.m4 (gl_DIRNAME):
* m4/exclude.m4 (gl_EXCLUDE):
* m4/exitfail.m4 (gl_EXITFAIL):
* m4/fcntl-safer.m4 (gl_FCNTL_SAFER):
* m4/file-type.m4 (gl_FILE_TYPE):
* m4/filemode.m4 (gl_FILEMODE):
* m4/filenamecat.m4 (gl_FILE_NAME_CONCAT):
* m4/fpending.m4 (gl_FUNC_FPENDING):
* m4/fprintftime.m4 (gl_FPRINTFTIME):
* m4/fts.m4 (gl_FUNC_FTS):
* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL):
* m4/getdate.m4 (gl_GETDATE):
* m4/gethrxtime.m4 (gl_GETHRXTIME):
* m4/getpagesize.m4 (gl_GETPAGESIZE):
* m4/getpass.m4 (gl_FUNC_GETPASS):
* m4/gettime.m4 (gl_GETTIME):
* m4/getugroups.m4 (gl_GETUGROUPS):
* m4/glob.m4 (gl_GLOB_SUBSTITUTE):
* m4/group-member.m4 (gl_FUNC_GROUP_MEMBER):
* m4/hard-locale.m4 (gl_HARD_LOCALE):
* m4/hash.m4 (gl_HASH):
* m4/idcache.m4 (gl_IDCACHE):
* m4/lchmod.m4 (gl_FUNC_LCHMOD):
* m4/lchown.m4 (gl_FUNC_LCHOWN):
* m4/long-options.m4 (gl_LONG_OPTIONS):
* m4/lstat.m4 (gl_FUNC_LSTAT):
* m4/md5.m4 (gl_MD5):
* m4/memcasecmp.m4 (gl_MEMCASECMP):
* m4/memcoll.m4 (gl_MEMCOLL):
* m4/mempcpy.m4 (gl_FUNC_MEMPCPY):
* m4/memrchr.m4 (gl_FUNC_MEMRCHR):
* m4/memxor.m4 (gl_MEMXOR):
* m4/mkancesdirs.m4 (gl_MKANCESDIRS):
* m4/mkdir-p.m4 (gl_MKDIR_PARENTS):
* m4/modechange.m4 (gl_MODECHANGE):
* m4/mountlist.m4 (gl_MOUNTLIST):
* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP):
* m4/openat.m4 (gl_FUNC_OPENAT):
* m4/pathmax.m4 (gl_PATHMAX):
* m4/physmem.m4 (gl_PHYSMEM):
* m4/posixtm.m4 (gl_POSIXTM):
* m4/posixver.m4 (gl_POSIXVER):
* m4/quote.m4 (gl_QUOTE):
* m4/quotearg.m4 (gl_QUOTEARG):
* m4/readtokens.m4 (gl_READTOKENS):
* m4/readutmp.m4 (gl_READUTMP):
* m4/regex.m4 (gl_REGEX):
* m4/safe-read.m4 (gl_SAFE_READ):
* m4/safe-write.m4 (gl_SAFE_WRITE):
* m4/same.m4 (gl_SAME):
* m4/save-cwd.m4 (gl_SAVE_CWD):
* m4/savedir.m4 (gl_SAVEDIR):
* m4/settime.m4 (gl_SETTIME):
* m4/sha1.m4 (gl_SHA1):
* m4/sig2str.m4 (gl_FUNC_SIG2STR):
* m4/stat-macros.m4 (gl_STAT_MACROS):
* m4/stat-time.m4 (gl_STAT_TIME):
* m4/stdio-safer.m4 (gl_FOPEN_SAFER):
* m4/stdlib-safer.m4 (gl_STDLIB_SAFER):
* m4/strdup.m4 (gl_FUNC_STRDUP):
* m4/strftime.m4 (gl_FUNC_GNU_STRFTIME):
* m4/strndup.m4 (gl_FUNC_STRNDUP):
* m4/strnlen.m4 (gl_FUNC_STRNLEN):
* m4/strverscmp.m4 (gl_FUNC_STRVERSCMP):
* m4/time_r.m4 (gl_TIME_R):
* m4/timespec.m4 (gl_TIMESPEC):
* m4/unistd-safer.m4 (gl_UNISTD_SAFER):
* m4/unlinkdir.m4 (gl_UNLINKDIR):
* m4/unlocked-io.m4 (gl_FUNC_GLIBC_UNLOCKED_IO):
* m4/userspec.m4 (gl_USERSPEC):
* m4/utimecmp.m4 (gl_UTIMECMP):
* m4/utimens.m4 (gl_UTIMENS):
* m4/xalloc.m4 (gl_XALLOC):
* m4/xgetcwd.m4 (gl_XGETCWD):
* m4/xnanosleep.m4 (gl_XNANOSLEEP):
* m4/xreadlink.m4 (gl_XREADLINK):
* m4/xstrtod.m4 (gl_XSTRTOD):
* m2/yesno.m4 (gl_YESNO):
Don't use AC_LIBSOURCES; instead, rely on the files in ../modules/
to get the necessary .h files and whatnot.

93 files changed, 245 insertions, 272 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 919e79b9a5..7813a7a930 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,101 @@
+2006-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* argmatch.m4: New file, from coreutils with AC_LIBSOURCES removed.
+	* dev-ino.m4, same-inode.m4: Remove.
+
+	* _inttypes_h.m4 (gl_INTTYPES_H):
+	* acl.m4 (AC_FUNC_ACL):
+	* backupfile.m4 (gl_BACKUPFILE):
+	* c-strtod.m4 (gl_C99_STRTOLD):
+	* canon-host.m4 (gl_CANON_HOST):
+	* canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME):
+	* chdir-long.m4 (gl_FUNC_CHDIR_LONG):
+	* chdir-safer.m4 (gl_CHDIR_SAFER):
+	* cloexec.m4 (gl_CLOEXEC):
+	* close-stream.m4 (gl_CLOSE_STREAM):
+	* closeout.m4 (gl_CLOSEOUT):
+	* dirfd.m4 (gl_FUNC_DIRFD):
+	* dirname.m4 (gl_DIRNAME):
+	* exclude.m4 (gl_EXCLUDE):
+	* exitfail.m4 (gl_EXITFAIL):
+	* fcntl-safer.m4 (gl_FCNTL_SAFER):
+	* file-type.m4 (gl_FILE_TYPE):
+	* filemode.m4 (gl_FILEMODE):
+	* filenamecat.m4 (gl_FILE_NAME_CONCAT):
+	* fpending.m4 (gl_FUNC_FPENDING):
+	* fprintftime.m4 (gl_FPRINTFTIME):
+	* fts.m4 (gl_FUNC_FTS):
+	* getcwd.m4 (gl_FUNC_GETCWD_NULL):
+	* getdate.m4 (gl_GETDATE):
+	* gethrxtime.m4 (gl_GETHRXTIME):
+	* getpagesize.m4 (gl_GETPAGESIZE):
+	* getpass.m4 (gl_FUNC_GETPASS):
+	* gettime.m4 (gl_GETTIME):
+	* getugroups.m4 (gl_GETUGROUPS):
+	* glob.m4 (gl_GLOB_SUBSTITUTE):
+	* group-member.m4 (gl_FUNC_GROUP_MEMBER):
+	* hard-locale.m4 (gl_HARD_LOCALE):
+	* hash.m4 (gl_HASH):
+	* idcache.m4 (gl_IDCACHE):
+	* lchmod.m4 (gl_FUNC_LCHMOD):
+	* lchown.m4 (gl_FUNC_LCHOWN):
+	* long-options.m4 (gl_LONG_OPTIONS):
+	* lstat.m4 (gl_FUNC_LSTAT):
+	* md5.m4 (gl_MD5):
+	* memcasecmp.m4 (gl_MEMCASECMP):
+	* memcoll.m4 (gl_MEMCOLL):
+	* mempcpy.m4 (gl_FUNC_MEMPCPY):
+	* memrchr.m4 (gl_FUNC_MEMRCHR):
+	* memxor.m4 (gl_MEMXOR):
+	* mkancesdirs.m4 (gl_MKANCESDIRS):
+	* mkdir-p.m4 (gl_MKDIR_PARENTS):
+	* modechange.m4 (gl_MODECHANGE):
+	* mountlist.m4 (gl_MOUNTLIST):
+	* nanosleep.m4 (gl_FUNC_NANOSLEEP):
+	* openat.m4 (gl_FUNC_OPENAT):
+	* pathmax.m4 (gl_PATHMAX):
+	* physmem.m4 (gl_PHYSMEM):
+	* posixtm.m4 (gl_POSIXTM):
+	* posixver.m4 (gl_POSIXVER):
+	* quote.m4 (gl_QUOTE):
+	* quotearg.m4 (gl_QUOTEARG):
+	* readtokens.m4 (gl_READTOKENS):
+	* readutmp.m4 (gl_READUTMP):
+	* regex.m4 (gl_REGEX):
+	* safe-read.m4 (gl_SAFE_READ):
+	* safe-write.m4 (gl_SAFE_WRITE):
+	* same.m4 (gl_SAME):
+	* save-cwd.m4 (gl_SAVE_CWD):
+	* savedir.m4 (gl_SAVEDIR):
+	* settime.m4 (gl_SETTIME):
+	* sha1.m4 (gl_SHA1):
+	* sig2str.m4 (gl_FUNC_SIG2STR):
+	* stat-macros.m4 (gl_STAT_MACROS):
+	* stat-time.m4 (gl_STAT_TIME):
+	* stdio-safer.m4 (gl_FOPEN_SAFER):
+	* stdlib-safer.m4 (gl_STDLIB_SAFER):
+	* strdup.m4 (gl_FUNC_STRDUP):
+	* strftime.m4 (gl_FUNC_GNU_STRFTIME):
+	* strndup.m4 (gl_FUNC_STRNDUP):
+	* strnlen.m4 (gl_FUNC_STRNLEN):
+	* strverscmp.m4 (gl_FUNC_STRVERSCMP):
+	* time_r.m4 (gl_TIME_R):
+	* timespec.m4 (gl_TIMESPEC):
+	* unistd-safer.m4 (gl_UNISTD_SAFER):
+	* unlinkdir.m4 (gl_UNLINKDIR):
+	* unlocked-io.m4 (gl_FUNC_GLIBC_UNLOCKED_IO):
+	* userspec.m4 (gl_USERSPEC):
+	* utimecmp.m4 (gl_UTIMECMP):
+	* utimens.m4 (gl_UTIMENS):
+	* xalloc.m4 (gl_XALLOC):
+	* xgetcwd.m4 (gl_XGETCWD):
+	* xnanosleep.m4 (gl_XNANOSLEEP):
+	* xreadlink.m4 (gl_XREADLINK):
+	* xstrtod.m4 (gl_XSTRTOD):
+	* yesno.m4 (gl_YESNO):
+	Don't use AC_LIBSOURCES; instead, rely on the files in ../modules/
+	to get the necessary .h files and whatnot.
+
 2006-08-19  Bruno Haible  <bruno@clisp.org>
 
 	BeOS portability.
diff --git a/m4/_inttypes_h.m4 b/m4/_inttypes_h.m4
index 791c472b16..241364d6da 100644
--- a/m4/_inttypes_h.m4
+++ b/m4/_inttypes_h.m4
@@ -1,4 +1,4 @@
-# _inttypes_h.m4 serial 4
+# _inttypes_h.m4 serial 5
 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,
@@ -8,7 +8,6 @@ dnl From Derek Price.
 
 AC_DEFUN([gl_INTTYPES_H],
 [AC_REQUIRE([gl_INCLUDE_NEXT])dnl
-AC_LIBSOURCES([inttypes.h])
 if test $gl_cv_have_include_next = no; then
   gl_ABSOLUTE_HEADER([inttypes.h])
 fi
diff --git a/m4/acl.m4 b/m4/acl.m4
index 2cc1ca3dd7..1d91a5a549 100644
--- 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, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005, 2006 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,7 +9,6 @@
 
 AC_DEFUN([AC_FUNC_ACL],
 [
-  AC_LIBSOURCES([acl.c, acl.h])
   AC_LIBOBJ([acl])
 
   dnl Prerequisites of lib/acl.c.
diff --git a/m4/same-inode.m4 b/m4/argmatch.m4
index 55b3928df9..beda5a1191 100644
--- a/m4/same-inode.m4
+++ b/m4/argmatch.m4
@@ -1,10 +1,10 @@
-#serial 1
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+#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,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_SAME_INODE],
+AC_DEFUN([gl_ARGMATCH],
 [
-  AC_LIBSOURCES([same-inode.h])
+  AC_LIBOBJ([argmatch])
 ])
diff --git a/m4/backupfile.m4 b/m4/backupfile.m4
index 6e08f72c52..effbce6e91 100644
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,4 +1,4 @@
-# backupfile.m4 serial 11
+# backupfile.m4 serial 12
 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,
@@ -6,7 +6,6 @@ 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.
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index 729f1aac70..7f206c71d1 100644
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,4 +1,4 @@
-# c-strtod.m4 serial 8
+# c-strtod.m4 serial 9
 
 # Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -35,7 +35,6 @@ AC_DEFUN([gl_C99_STRTOLD],
 
 AC_DEFUN([gl_C_STRTOD],
 [
-  AC_LIBSOURCES([c-strtod.c, c-strtod.h])
   AC_LIBOBJ([c-strtod])
 
   dnl Prerequisites of lib/c-strtod.c.
@@ -45,7 +44,6 @@ AC_DEFUN([gl_C_STRTOD],
 
 AC_DEFUN([gl_C_STRTOLD],
 [
-  AC_LIBSOURCES([c-strtod.c, c-strtold.c, c-strtod.h])
   AC_LIBOBJ([c-strtold])
 
   dnl Prerequisites of lib/c-strtold.c.
diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index b41610471b..d13db20e49 100644
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,12 +1,11 @@
-# canon-host.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# canon-host.m4 serial 8
+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.
 
 AC_DEFUN([gl_CANON_HOST],
 [
-  AC_LIBSOURCES([canon-host.c, canon-host.h])
   AC_LIBOBJ([canon-host])
   gl_PREREQ_CANON_HOST
 ])
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index 0ed92e1f15..8b10a9c4bf 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -9,7 +9,6 @@
 
 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
-    AC_LIBSOURCES([canonicalize.c, canonicalize.h])
     AC_LIBOBJ([canonicalize])
 
     AC_CHECK_HEADERS(sys/param.h)
diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 170434924a..88e980f3a8 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 # Use Gnulib's robust chdir function.
 # It can handle arbitrarily long directory names, which means
@@ -6,7 +6,7 @@
 # never fails with ENAMETOOLONG.
 # Arrange to compile chdir-long.c only on systems that define PATH_MAX.
 
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,7 +15,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_CHDIR_LONG],
 [
-  AC_LIBSOURCES([chdir-long.c, chdir-long.h])
   AC_CACHE_CHECK([whether this system has an arbitrary file name length limit],
     gl_have_arbitrary_file_name_length_limit,
     [AC_EGREP_CPP([have_arbitrary_file_name_length_limit],
diff --git a/m4/chdir-safer.m4 b/m4/chdir-safer.m4
index b3c351c789..22ad50673c 100644
--- a/m4/chdir-safer.m4
+++ b/m4/chdir-safer.m4
@@ -1,4 +1,4 @@
-#serial 2
+#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,
@@ -6,6 +6,5 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CHDIR_SAFER],
 [
-  AC_LIBSOURCES([chdir-safer.c, chdir-safer.h, same-inode.h])
   AC_LIBOBJ([chdir-safer])
 ])
diff --git a/m4/cloexec.m4 b/m4/cloexec.m4
index 7e0f801e91..4c4e26a143 100644
--- a/m4/cloexec.m4
+++ b/m4/cloexec.m4
@@ -1,11 +1,10 @@
-#serial 5
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#serial 6
+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,
 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])
 ])
diff --git a/m4/close-stream.m4 b/m4/close-stream.m4
index 93f4d9a916..bc219b59ed 100644
--- a/m4/close-stream.m4
+++ b/m4/close-stream.m4
@@ -5,7 +5,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CLOSE_STREAM],
 [
-  AC_LIBSOURCES([close-stream.c, close-stream.h])
   AC_LIBOBJ([close-stream])
 
   dnl Prerequisites of lib/close-stream.c.
diff --git a/m4/closeout.m4 b/m4/closeout.m4
index 8d3ead35f2..55a65f0464 100644
--- a/m4/closeout.m4
+++ b/m4/closeout.m4
@@ -1,12 +1,11 @@
-# closeout.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# closeout.m4 serial 5
+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.
 
 AC_DEFUN([gl_CLOSEOUT],
 [
-  AC_LIBSOURCES([closeout.c, closeout.h])
   AC_LIBOBJ([closeout])
 
   dnl Prerequisites of lib/closeout.c.
diff --git a/m4/dev-ino.m4 b/m4/dev-ino.m4
deleted file mode 100644
index 7b51d98675..0000000000
--- a/m4/dev-ino.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-#serial 1
-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.
-
-AC_DEFUN([gl_STRUCT_DEV_INO],
-[
-  AC_LIBSOURCES([dev-ino.h])
-])
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index c377b87a35..125966b1a0 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-#serial 13   -*- Autoconf -*-
+#serial 14   -*- Autoconf -*-
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
@@ -12,8 +12,6 @@ dnl From Jim Meyering
 
 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])
diff --git a/m4/dirname.m4 b/m4/dirname.m4
index f3412ad080..e35da96582 100644
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,4 +1,4 @@
-#serial 6   -*- autoconf -*-
+#serial 7   -*- autoconf -*-
 dnl Copyright (C) 2002-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,
@@ -6,8 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_DIRNAME],
 [
-  AC_LIBSOURCES([dirname.c, dirname.h])
+  AC_LIBOBJ([basename])
   AC_LIBOBJ([dirname])
+  AC_LIBOBJ([stripslash])
 
   dnl Prerequisites of lib/dirname.h.
   AC_REQUIRE([gl_AC_DOS])
diff --git a/m4/exclude.m4 b/m4/exclude.m4
index 87acf841f7..23727e6322 100644
--- a/m4/exclude.m4
+++ b/m4/exclude.m4
@@ -1,4 +1,4 @@
-# exclude.m4 serial 6
+# exclude.m4 serial 7
 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,
@@ -6,6 +6,5 @@ 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])
 ])
diff --git a/m4/exitfail.m4 b/m4/exitfail.m4
index 5523676f1d..b7a691e501 100644
--- a/m4/exitfail.m4
+++ b/m4/exitfail.m4
@@ -1,12 +1,11 @@
-# exitfail.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# exitfail.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.
 
 AC_DEFUN([gl_EXITFAIL],
 [
-  AC_LIBSOURCES([exitfail.c, exitfail.h])
   AC_LIBOBJ([exitfail])
 
   dnl No prerequisites of lib/exitfail.c.
diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4
index be210f9a02..97e3c45186 100644
--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,12 +1,11 @@
-#serial 2
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#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,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FCNTL_SAFER],
 [
-  AC_LIBSOURCES([creat-safer.c, fcntl-safer.h, open-safer.c, fcntl--.h])
   AC_LIBOBJ([open-safer])
   AC_LIBOBJ([creat-safer])
 ])
diff --git a/m4/file-type.m4 b/m4/file-type.m4
index 7d1830965b..2d0a1d8fe3 100644
--- a/m4/file-type.m4
+++ b/m4/file-type.m4
@@ -1,11 +1,10 @@
-# file-type.m4 serial 5
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# file-type.m4 serial 6
+dnl Copyright (C) 2002, 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.
 
 AC_DEFUN([gl_FILE_TYPE],
 [
-  AC_LIBSOURCES([file-type.c, file-type.h])
   AC_LIBOBJ([file-type])
 ])
diff --git a/m4/filemode.m4 b/m4/filemode.m4
index fa571b3f2e..64f5cb918c 100644
--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,4 +1,4 @@
-# filemode.m4 serial 6
+# filemode.m4 serial 7
 dnl Copyright (C) 2002, 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,
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FILEMODE],
 [
   AC_REQUIRE([AC_STRUCT_ST_DM_MODE])
-  AC_LIBSOURCES([filemode.c, filemode.h])
   AC_LIBOBJ([filemode])
   AC_CHECK_DECLS_ONCE([strmode])
 ])
diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4
index c75a57d065..bb46dbaf0d 100644
--- a/m4/filenamecat.m4
+++ b/m4/filenamecat.m4
@@ -1,12 +1,11 @@
-# filenamecat.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# filenamecat.m4 serial 8
+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.
 
 AC_DEFUN([gl_FILE_NAME_CONCAT],
 [
-  AC_LIBSOURCES([filenamecat.c, filenamecat.h])
   AC_LIBOBJ([filenamecat])
 
   dnl Prerequisites of lib/filenamecat.c.
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index edf7378002..e5917c5854 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
 
 # Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -15,8 +15,6 @@ dnl we have to grub around in the FILE struct.
 
 AC_DEFUN([gl_FUNC_FPENDING],
 [
-  AC_LIBSOURCES([__fpending.c, __fpending.h])
-
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
   fp_headers='
diff --git a/m4/fprintftime.m4 b/m4/fprintftime.m4
index f60df3ec50..8b088e86a6 100644
--- a/m4/fprintftime.m4
+++ b/m4/fprintftime.m4
@@ -1,11 +1,10 @@
-#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.
 
 AC_DEFUN([gl_FPRINTFTIME],
 [
-  AC_LIBSOURCES([fprintftime.c, fprintftime.h])
   AC_LIBOBJ([fprintftime])
 ])
diff --git a/m4/fts.m4 b/m4/fts.m4
index ebb2498267..2c9348e637 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,4 +1,4 @@
-#serial 10
+#serial 11
 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,
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_FTS],
 [
   AC_REQUIRE([gl_FUNC_FTS_CORE])
-  AC_LIBSOURCES([fts-cycle.c])
 ])
 
 AC_DEFUN([gl_FUNC_FTS_LGPL],
@@ -20,8 +19,6 @@ AC_DEFUN([gl_FUNC_FTS_LGPL],
 
 AC_DEFUN([gl_FUNC_FTS_CORE],
 [
-  AC_LIBSOURCES([fts.c, fts_.h])
-
   dnl Use this version of fts unconditionally, since the GNU libc and
   dnl NetBSD versions have bugs and/or unnecessary limitations.
   AC_LIBOBJ([fts])
diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
index 2a19a083ac..a1096f2e2c 100644
--- a/m4/getcwd.m4
+++ b/m4/getcwd.m4
@@ -9,8 +9,6 @@
 
 AC_DEFUN([gl_FUNC_GETCWD_NULL],
   [
-   AC_LIBSOURCES([getcwd.c, getcwd.h])
-
    AC_CACHE_CHECK([whether getcwd (NULL, 0) allocates memory for result],
      [gl_cv_func_getcwd_null],
      [AC_TRY_RUN(
diff --git a/m4/getdate.m4 b/m4/getdate.m4
index 225b7b75b3..bfbc4336b8 100644
--- a/m4/getdate.m4
+++ b/m4/getdate.m4
@@ -1,4 +1,4 @@
-# getdate.m4 serial 9
+# getdate.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,
@@ -19,7 +19,6 @@ AC_DEFUN([gl_C_COMPOUND_LITERALS],
 
 AC_DEFUN([gl_GETDATE],
 [
-  AC_LIBSOURCES([getdate.h, getdate.y])
   AC_LIBOBJ([getdate])
 
   dnl Prerequisites of lib/getdate.h.
diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4
index a816891c37..b596fec290 100644
--- a/m4/gethrxtime.m4
+++ b/m4/gethrxtime.m4
@@ -1,4 +1,4 @@
-# gethrxtime.m4 serial 5
+# gethrxtime.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,
@@ -8,7 +8,6 @@ dnl Written by Paul Eggert.
 
 AC_DEFUN([gl_GETHRXTIME],
 [
-  AC_LIBSOURCES([gethrxtime.c, gethrxtime.h, xtime.h])
   AC_REQUIRE([gl_ARITHMETIC_HRTIME_T])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_XTIME])
diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index 6d84890e7b..e8697bda90 100644
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,4 +1,4 @@
-# getpagesize.m4 serial 5
+# getpagesize.m4 serial 6
 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,
@@ -6,8 +6,6 @@ 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)
   AC_CHECK_HEADERS(OS.h)
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index 44c24d030a..014c52d14a 100644
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,4 +1,4 @@
-# getpass.m4 serial 8
+# getpass.m4 serial 9
 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,
@@ -7,8 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 # Provide a getpass() function if the system doesn't have it.
 AC_DEFUN([gl_FUNC_GETPASS],
 [
-  AC_LIBSOURCES([getpass.c, getpass.h])
-
   AC_REPLACE_FUNCS(getpass)
   AC_CHECK_DECLS_ONCE(getpass)
   if test $ac_cv_func_getpass = no; then
@@ -20,8 +18,6 @@ AC_DEFUN([gl_FUNC_GETPASS],
 # 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)
diff --git a/m4/gettime.m4 b/m4/gettime.m4
index 0ae4c39087..601a5e6976 100644
--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,12 +1,11 @@
-# gettime.m4 serial 5
-dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# gettime.m4 serial 6
+dnl Copyright (C) 2002, 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.
 
 AC_DEFUN([gl_GETTIME],
 [
-  AC_LIBSOURCES([gettime.c])
   AC_LIBOBJ([gettime])
 
   dnl Prerequisites of lib/gettime.c.
diff --git a/m4/getugroups.m4 b/m4/getugroups.m4
index 0369b07b3d..3c5e15eed7 100644
--- a/m4/getugroups.m4
+++ b/m4/getugroups.m4
@@ -1,12 +1,11 @@
-# getugroups.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# getugroups.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.
 
 AC_DEFUN([gl_GETUGROUPS],
 [
-  AC_LIBSOURCES([getugroups.c])
   AC_LIBOBJ([getugroups])
 
   dnl Prerequisites of lib/getugroups.c.
diff --git a/m4/glob.m4 b/m4/glob.m4
index 497677cc58..767c54d7ad 100644
--- a/m4/glob.m4
+++ b/m4/glob.m4
@@ -1,4 +1,4 @@
-# glob.m4 serial 6
+# glob.m4 serial 7
 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,
@@ -13,7 +13,6 @@ AC_DEFUN([gl_GLOB_SUBSTITUTE],
   gl_PREREQ_GLOB
 
   GLOB_H=glob.h
-  AC_LIBSOURCES([glob.c, glob_.h, glob-libc.h])
   AC_LIBOBJ([glob])
   AC_SUBST([GLOB_H])
 ])
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index ab4a920eda..6f2f57e974 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,6 +1,8 @@
-#serial 9
+#serial 10
+
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006 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,8 +11,6 @@ dnl Written by Jim Meyering
 
 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])
 
diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4
index 640a75560a..8b577eff00 100644
--- a/m4/hard-locale.m4
+++ b/m4/hard-locale.m4
@@ -1,5 +1,5 @@
-# hard-locale.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# hard-locale.m4 serial 7
+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.
@@ -7,6 +7,5 @@ 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_LIBSOURCES([hard-locale.c, hard-locale.h])
   AC_LIBOBJ([hard-locale])
 ])
diff --git a/m4/hash.m4 b/m4/hash.m4
index 948dd97207..1b1873c326 100644
--- a/m4/hash.m4
+++ b/m4/hash.m4
@@ -1,12 +1,11 @@
-# hash.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# hash.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.
 
 AC_DEFUN([gl_HASH],
 [
-  AC_LIBSOURCES([hash.c, hash.h])
   AC_LIBOBJ([hash])
 
   dnl Prerequisites of lib/hash.c.
diff --git a/m4/idcache.m4 b/m4/idcache.m4
index 804ce42a10..8bb2fc94fa 100644
--- a/m4/idcache.m4
+++ b/m4/idcache.m4
@@ -1,11 +1,10 @@
-# idcache.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# idcache.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.
 
 AC_DEFUN([gl_IDCACHE],
 [
-  AC_LIBSOURCES([idcache.c])
   AC_LIBOBJ([idcache])
 ])
diff --git a/m4/lchmod.m4 b/m4/lchmod.m4
index d035bba286..06467a04b0 100644
--- a/m4/lchmod.m4
+++ b/m4/lchmod.m4
@@ -1,6 +1,6 @@
-#serial 1
+#serial 2
 
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+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.
@@ -10,6 +10,5 @@ dnl Provide a replacement for lchmod on hosts that lack it.
 
 AC_DEFUN([gl_FUNC_LCHMOD],
 [
-  AC_LIBSOURCES([lchmod.h])
   AC_CHECK_FUNCS_ONCE([lchmod])
 ])
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index cbbbe34f1b..ae54522dae 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,6 +1,8 @@
-#serial 8
+#serial 9
+
+dnl Copyright (C) 1998, 2001, 2003, 2004, 2005, 2006 Free Software
+dnl Foundation, Inc.
 
-dnl Copyright (C) 1998, 2001, 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.
@@ -10,7 +12,6 @@ dnl Provide lchown on systems that lack it.
 
 AC_DEFUN([gl_FUNC_LCHOWN],
 [
-  AC_LIBSOURCES([lchown.c, lchown.h])
   AC_REQUIRE([AC_TYPE_UID_T])
   AC_REQUIRE([gl_FUNC_CHOWN])
   AC_REQUIRE([gl_STAT_MACROS])
diff --git a/m4/long-options.m4 b/m4/long-options.m4
index f4af901e0d..2712bad236 100644
--- a/m4/long-options.m4
+++ b/m4/long-options.m4
@@ -1,12 +1,11 @@
-# long-options.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# long-options.m4 serial 5
+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.
 
 AC_DEFUN([gl_LONG_OPTIONS],
 [
-  AC_LIBSOURCES([long-options.c, long-options.h])
   AC_LIBOBJ([long-options])
 
   dnl Prerequisites of lib/long-options.c.
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 20e6fc3157..2d45857715 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,7 +1,7 @@
-#serial 14
+#serial 15
 
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,8 +11,6 @@ dnl From Jim Meyering.
 
 AC_DEFUN([gl_FUNC_LSTAT],
 [
-  AC_LIBSOURCES([lstat.c, lstat.h])
-
   AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ(lstat).
   :
diff --git a/m4/md5.m4 b/m4/md5.m4
index 0c4d86b591..5a1f8755a0 100644
--- a/m4/md5.m4
+++ b/m4/md5.m4
@@ -1,12 +1,11 @@
-# md5.m4 serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# md5.m4 serial 9
+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.
 
 AC_DEFUN([gl_MD5],
 [
-  AC_LIBSOURCES([md5.c, md5.h])
   AC_LIBOBJ([md5])
 
   dnl Prerequisites of lib/md5.c.
diff --git a/m4/memcasecmp.m4 b/m4/memcasecmp.m4
index 95a3dc0878..7ea362cbca 100644
--- a/m4/memcasecmp.m4
+++ b/m4/memcasecmp.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 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,
@@ -6,6 +6,5 @@ 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])
 ])
diff --git a/m4/memcoll.m4 b/m4/memcoll.m4
index f9cd1deac9..4362f1b3c5 100644
--- a/m4/memcoll.m4
+++ b/m4/memcoll.m4
@@ -1,4 +1,4 @@
-# memcoll.m4 serial 6
+# memcoll.m4 serial 7
 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,
@@ -6,7 +6,6 @@ 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.
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4
index a96168d88e..9aec73dc5b 100644
--- a/m4/mempcpy.m4
+++ b/m4/mempcpy.m4
@@ -1,12 +1,11 @@
-# mempcpy.m4 serial 3
-dnl Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# mempcpy.m4 serial 4
+dnl Copyright (C) 2003, 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.
 
 AC_DEFUN([gl_FUNC_MEMPCPY],
 [
-  AC_LIBSOURCES([mempcpy.c, mempcpy.h])
 
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
diff --git a/m4/memrchr.m4 b/m4/memrchr.m4
index e2406ec899..5d971551df 100644
--- a/m4/memrchr.m4
+++ b/m4/memrchr.m4
@@ -1,13 +1,11 @@
-# memrchr.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# memrchr.m4 serial 5
+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.
 
 AC_DEFUN([gl_FUNC_MEMRCHR],
 [
-  AC_LIBSOURCES([memrchr.c, memrchr.h])
-
   dnl Persuade glibc <string.h> to declare memrchr().
   AC_REQUIRE([AC_GNU_SOURCE])
 
diff --git a/m4/memxor.m4 b/m4/memxor.m4
index bf88a410dc..e14ffbb0f1 100644
--- a/m4/memxor.m4
+++ b/m4/memxor.m4
@@ -1,4 +1,4 @@
-# memxor.m4 serial 2
+# memxor.m4 serial 3
 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,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MEMXOR],
 [
-  AC_LIBSOURCES([memxor.h, memxor.c])
   AC_LIBOBJ([memxor])
   AC_REQUIRE([AC_C_RESTRICT])
 ])
diff --git a/m4/mkancesdirs.m4 b/m4/mkancesdirs.m4
index cd44d4874c..6833deec25 100644
--- a/m4/mkancesdirs.m4
+++ b/m4/mkancesdirs.m4
@@ -6,6 +6,5 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MKANCESDIRS],
 [
-  AC_LIBSOURCES([mkancesdirs.c, mkancesdirs.h])
   AC_LIBOBJ([mkancesdirs])
 ])
diff --git a/m4/mkdir-p.m4 b/m4/mkdir-p.m4
index b0ceb18211..9317fa4dd8 100644
--- a/m4/mkdir-p.m4
+++ b/m4/mkdir-p.m4
@@ -1,4 +1,4 @@
-# mkdir-p.m4 serial 11
+# mkdir-p.m4 serial 12
 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,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MKDIR_PARENTS],
 [
-  AC_LIBSOURCES([dirchownmod.c, dirchownmod.h, mkdir-p.c, mkdir-p.h])
   AC_LIBOBJ([dirchownmod])
   AC_LIBOBJ([mkdir-p])
 
diff --git a/m4/modechange.m4 b/m4/modechange.m4
index c703e94f50..3b23955e5f 100644
--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,11 +1,10 @@
-# modechange.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# modechange.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.
 
 AC_DEFUN([gl_MODECHANGE],
 [
-  AC_LIBSOURCES([modechange.c, modechange.h])
   AC_LIBOBJ([modechange])
 ])
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index b2a2e12f89..c25f44e7e2 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,13 +1,11 @@
-#serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 9
+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.
 
 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
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 56c66bbb92..88e630e897 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-#serial 17
+#serial 18
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
@@ -14,8 +14,6 @@ dnl
 
 AC_DEFUN([gl_FUNC_NANOSLEEP],
 [
- AC_LIBSOURCES([nanosleep.c])
-
  dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
diff --git a/m4/openat.m4 b/m4/openat.m4
index 0abb8c87d3..a17056532d 100644
--- a/m4/openat.m4
+++ b/m4/openat.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 # See if we need to use our replacement for Solaris' openat et al functions.
 
 dnl Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -10,11 +10,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_OPENAT],
 [
-  AC_LIBSOURCES([openat.c, openat.h, openat-priv.h, openat-die.c, at-func.c])
-  AC_LIBSOURCES([intprops.h])
-  AC_LIBSOURCES([mkdirat.c])
-  AC_LIBSOURCES([fchmodat.c])
-
   # No system provides these functions; compile them unconditionally.
   AC_LIBOBJ([mkdirat])
   AC_LIBOBJ([fchmodat])
diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
index 26c1659354..64bf26ff75 100644
--- a/m4/pathmax.m4
+++ b/m4/pathmax.m4
@@ -1,13 +1,11 @@
-# pathmax.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# pathmax.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.
 
 AC_DEFUN([gl_PATHMAX],
 [
-  AC_LIBSOURCES([pathmax.h])
-
   dnl Prerequisites of lib/pathmax.h.
   AC_CHECK_HEADERS_ONCE(sys/param.h)
 ])
diff --git a/m4/physmem.m4 b/m4/physmem.m4
index 18250ddecc..6956e3ad0c 100644
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,5 +1,5 @@
-# physmem.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# physmem.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.
@@ -26,7 +26,6 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
 
 AC_DEFUN([gl_PHYSMEM],
 [
-  AC_LIBSOURCES([physmem.c, physmem.h])
   AC_LIBOBJ([physmem])
 
   # Prerequisites of lib/physmem.c.
diff --git a/m4/posixtm.m4 b/m4/posixtm.m4
index 9acf84a121..f0c5b287f2 100644
--- a/m4/posixtm.m4
+++ b/m4/posixtm.m4
@@ -1,12 +1,11 @@
-# posixtm.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# posixtm.m4 serial 5
+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.
 
 AC_DEFUN([gl_POSIXTM],
 [
-  AC_LIBSOURCES([posixtm.c, posixtm.h])
   AC_LIBOBJ(posixtm)
 
   dnl Prerequisites of lib/posixtm.c.
diff --git a/m4/posixver.m4 b/m4/posixver.m4
index 5432702b3d..f60a094802 100644
--- a/m4/posixver.m4
+++ b/m4/posixver.m4
@@ -1,4 +1,4 @@
-# posixver.m4 serial 8
+# posixver.m4 serial 9
 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,
@@ -6,7 +6,6 @@ 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_REQUIRE([gl_DEFAULT_POSIX2_VERSION])
diff --git a/m4/quote.m4 b/m4/quote.m4
index ca66b53aaf..0f08791a90 100644
--- a/m4/quote.m4
+++ b/m4/quote.m4
@@ -1,12 +1,11 @@
-# quote.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# quote.m4 serial 5
+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.
 
 AC_DEFUN([gl_QUOTE],
 [
-  AC_LIBSOURCES([quote.c, quote.h])
   AC_LIBOBJ([quote])
 
   dnl Prerequisites of lib/quote.c.
diff --git a/m4/quotearg.m4 b/m4/quotearg.m4
index 98ae13316f..b6d3d7ae88 100644
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,12 +1,11 @@
-# quotearg.m4 serial 4
-dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# quotearg.m4 serial 5
+dnl Copyright (C) 2002, 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.
 
 AC_DEFUN([gl_QUOTEARG],
 [
-  AC_LIBSOURCES([quotearg.c, quotearg.h])
   AC_LIBOBJ([quotearg])
 
   dnl Prerequisites of lib/quotearg.c.
diff --git a/m4/readtokens.m4 b/m4/readtokens.m4
index 94561ebb3a..596a97b20c 100644
--- a/m4/readtokens.m4
+++ b/m4/readtokens.m4
@@ -1,12 +1,11 @@
-# readtokens.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# readtokens.m4 serial 5
+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.
 
 AC_DEFUN([gl_READTOKENS],
 [
-  AC_LIBSOURCES([readtokens.c, readtokens.h])
   AC_LIBOBJ([readtokens])
 
   dnl Prerequisites of lib/readtokens.c.
diff --git a/m4/readutmp.m4 b/m4/readutmp.m4
index ac413f6c14..55a2be8616 100644
--- a/m4/readutmp.m4
+++ b/m4/readutmp.m4
@@ -1,12 +1,11 @@
-# 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.
 
 AC_DEFUN([gl_READUTMP],
 [
-  AC_LIBSOURCES([readutmp.c, readutmp.h])
   AC_LIBOBJ([readutmp])
 
   dnl Prerequisites of lib/readutmp.h and lib/readutmp.c.
diff --git a/m4/regex.m4 b/m4/regex.m4
index 5ca868bbed..46c0131e4a 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 38
+#serial 39
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006 Free Software Foundation, Inc.
@@ -14,10 +14,6 @@ AC_PREREQ([2.50])
 
 AC_DEFUN([gl_REGEX],
 [
-  AC_LIBSOURCES(
-    [regcomp.c, regex.c, regex.h,
-     regex_internal.c, regex_internal.h, regexec.c])
-
   AC_ARG_WITH([included-regex],
     [AC_HELP_STRING([--without-included-regex],
 		    [don't compile regex; this is the default on
diff --git a/m4/safe-read.m4 b/m4/safe-read.m4
index e1f306417e..7a89d0a6c1 100644
--- a/m4/safe-read.m4
+++ b/m4/safe-read.m4
@@ -1,12 +1,11 @@
-# safe-read.m4 serial 4
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# safe-read.m4 serial 5
+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.
 
 AC_DEFUN([gl_SAFE_READ],
 [
-  AC_LIBSOURCES([safe-read.c, safe-read.h])
   AC_LIBOBJ([safe-read])
 
   gl_PREREQ_SAFE_READ
diff --git a/m4/safe-write.m4 b/m4/safe-write.m4
index 197adeba21..db119ffa59 100644
--- a/m4/safe-write.m4
+++ b/m4/safe-write.m4
@@ -1,12 +1,11 @@
-# safe-write.m4 serial 2
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# safe-write.m4 serial 3
+dnl Copyright (C) 2002, 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.
 
 AC_DEFUN([gl_SAFE_WRITE],
 [
-  AC_LIBSOURCES([safe-write.c, safe-write.h])
   AC_LIBOBJ([safe-write])
 
   gl_PREREQ_SAFE_WRITE
diff --git a/m4/same.m4 b/m4/same.m4
index 0eacf4f1b0..709c8f1cf6 100644
--- a/m4/same.m4
+++ b/m4/same.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 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,
@@ -6,7 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_SAME],
 [
-  AC_LIBSOURCES([same.c, same.h, same-inode.h])
   AC_LIBOBJ([same])
 
   dnl Prerequisites of lib/same.c.
diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4
index eec27890f5..7a2286bf44 100644
--- a/m4/save-cwd.m4
+++ b/m4/save-cwd.m4
@@ -1,12 +1,11 @@
-#serial 7
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 8
+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.
 
 AC_DEFUN([gl_SAVE_CWD],
 [
-  AC_LIBSOURCES([save-cwd.c, save-cwd.h])
   AC_LIBOBJ([save-cwd])
   dnl Prerequisites for lib/save-cwd.c.
   AC_CHECK_FUNCS_ONCE(fchdir)
diff --git a/m4/savedir.m4 b/m4/savedir.m4
index b6968ebaa5..1fc6c8150e 100644
--- a/m4/savedir.m4
+++ b/m4/savedir.m4
@@ -1,4 +1,4 @@
-# savedir.m4 serial 8
+# savedir.m4 serial 9
 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,
@@ -6,6 +6,5 @@ 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])
 ])
diff --git a/m4/settime.m4 b/m4/settime.m4
index 20bb360d8c..693e84ebbc 100644
--- a/m4/settime.m4
+++ b/m4/settime.m4
@@ -1,12 +1,11 @@
-# settime.m4 serial 4
-dnl Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+# settime.m4 serial 5
+dnl Copyright (C) 2002, 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.
 
 AC_DEFUN([gl_SETTIME],
 [
-  AC_LIBSOURCES([settime.c])
   AC_LIBOBJ([settime])
 
   dnl Prerequisites of lib/settime.c.
diff --git a/m4/sha1.m4 b/m4/sha1.m4
index 7b6c21cb83..c6e6184b2c 100644
--- a/m4/sha1.m4
+++ b/m4/sha1.m4
@@ -1,12 +1,11 @@
-# sha1.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# sha1.m4 serial 7
+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.
 
 AC_DEFUN([gl_SHA1],
 [
-  AC_LIBSOURCES([sha1.c, sha1.h])
   AC_LIBOBJ([sha1])
 
   dnl Prerequisites of lib/sha1.c.
diff --git a/m4/sig2str.m4 b/m4/sig2str.m4
index 92c80630c3..8b85c430cb 100644
--- a/m4/sig2str.m4
+++ b/m4/sig2str.m4
@@ -1,12 +1,11 @@
-#serial 4
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+#serial 5
+dnl Copyright (C) 2002, 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.
 
 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
diff --git a/m4/stat-macros.m4 b/m4/stat-macros.m4
index b01218a9b0..5f3301d08c 100644
--- a/m4/stat-macros.m4
+++ b/m4/stat-macros.m4
@@ -1,6 +1,6 @@
-#serial 2
+#serial 3
 
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,5 @@
 
 AC_DEFUN([gl_STAT_MACROS],
 [
-  AC_LIBSOURCES([stat-macros.h])
-
   AC_REQUIRE([AC_HEADER_STAT])
 ])
diff --git a/m4/stat-time.m4 b/m4/stat-time.m4
index 89a7aa4b8d..1e46a09fe4 100644
--- a/m4/stat-time.m4
+++ b/m4/stat-time.m4
@@ -1,6 +1,8 @@
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998, 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2001, 2003, 2005, 2006 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,8 +17,6 @@ dnl From Paul Eggert.
 
 AC_DEFUN([gl_STAT_TIME],
 [
-  AC_LIBSOURCES([stat-time.h])
-
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
diff --git a/m4/stdio-safer.m4 b/m4/stdio-safer.m4
index 40be1ad474..e1cfc02c53 100644
--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 dnl Copyright (C) 2002, 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,
@@ -6,12 +6,10 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FOPEN_SAFER],
 [
-  AC_LIBSOURCES([fopen-safer.c, stdio-safer.h, stdio--.h])
   AC_LIBOBJ([fopen-safer])
 ])
 
 AC_DEFUN([gl_TMPFILE_SAFER],
 [
-  AC_LIBSOURCES([tmpfile-safer.c, stdio-safer.h, stdio--.h])
   AC_LIBOBJ([tmpfile-safer])
 ])
diff --git a/m4/stdlib-safer.m4 b/m4/stdlib-safer.m4
index f9cc000369..36fd17c892 100644
--- a/m4/stdlib-safer.m4
+++ b/m4/stdlib-safer.m4
@@ -1,11 +1,10 @@
-# stdlib-safer.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# stdlib-safer.m4 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.
 
 AC_DEFUN([gl_STDLIB_SAFER],
 [
-  AC_LIBSOURCES([mkstemp-safer.c, stdlib-safer.h, stdlib--.h])
   AC_LIBOBJ([mkstemp-safer])
 ])
diff --git a/m4/strdup.m4 b/m4/strdup.m4
index 42325ab9ee..f7786e944b 100644
--- a/m4/strdup.m4
+++ b/m4/strdup.m4
@@ -1,13 +1,11 @@
-# strdup.m4 serial 6
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# strdup.m4 serial 7
+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.
 
 AC_DEFUN([gl_FUNC_STRDUP],
 [
-  AC_LIBSOURCES([strdup.c, strdup.h])
-
   AC_REPLACE_FUNCS(strdup)
   AC_CHECK_DECLS_ONCE(strdup)
   gl_PREREQ_STRDUP
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index ea93042dbb..7abad56dc0 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,4 +1,4 @@
-#serial 27
+#serial 28
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
@@ -16,7 +16,6 @@ AC_DEFUN([gl_FUNC_GNU_STRFTIME],
 # 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])
 
  # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
diff --git a/m4/strndup.m4 b/m4/strndup.m4
index e333f5cfdb..180ad203ec 100644
--- a/m4/strndup.m4
+++ b/m4/strndup.m4
@@ -1,4 +1,4 @@
-# strndup.m4 serial 7
+# strndup.m4 serial 8
 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,
@@ -6,8 +6,6 @@ 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])
 
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
index 67964c8d7d..0213a8ae35 100644
--- a/m4/strnlen.m4
+++ b/m4/strnlen.m4
@@ -1,13 +1,11 @@
-# strnlen.m4 serial 5
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# strnlen.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.
 
 AC_DEFUN([gl_FUNC_STRNLEN],
 [
-  AC_LIBSOURCES([strnlen.c, strnlen.h])
-
   dnl Persuade glibc <string.h> to declare strnlen().
   AC_REQUIRE([AC_GNU_SOURCE])
 
diff --git a/m4/strverscmp.m4 b/m4/strverscmp.m4
index 46e178beb6..ab20c1809d 100644
--- a/m4/strverscmp.m4
+++ b/m4/strverscmp.m4
@@ -1,13 +1,11 @@
-# strverscmp.m4 serial 3
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# strverscmp.m4 serial 4
+dnl Copyright (C) 2002, 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.
 
 AC_DEFUN([gl_FUNC_STRVERSCMP],
 [
-  AC_LIBSOURCES([strverscmp.c, strverscmp.h])
-
   dnl Persuade glibc <string.h> to declare strverscmp().
   AC_REQUIRE([AC_GNU_SOURCE])
 
diff --git a/m4/time_r.m4 b/m4/time_r.m4
index 204c424dd3..f8fbaf9196 100644
--- a/m4/time_r.m4
+++ b/m4/time_r.m4
@@ -9,7 +9,6 @@ dnl Written by Paul Eggert.
 
 AC_DEFUN([gl_TIME_R],
 [
-  AC_LIBSOURCES([time_r.c, time_r.h])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([AC_C_RESTRICT])
 
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index a500a3e711..c281128c2b 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -11,8 +11,6 @@ dnl From Jim Meyering
 
 AC_DEFUN([gl_TIMESPEC],
 [
-  AC_LIBSOURCES([timespec.h])
-
   dnl Prerequisites of lib/timespec.h.
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_HEADER_TIME])
diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4
index 30526405d0..09adf931f5 100644
--- a/m4/unistd-safer.m4
+++ b/m4/unistd-safer.m4
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_UNISTD_SAFER],
 [
   AC_CHECK_FUNCS_ONCE([pipe])
-  AC_LIBSOURCES([dup-safer.c, fd-safer.c, pipe-safer.c, unistd-safer.h, unistd--.h])
   AC_LIBOBJ([dup-safer])
   AC_LIBOBJ([fd-safer])
   AC_LIBOBJ([pipe-safer])
diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4
index fd5ee7c9df..9ec7e08b71 100644
--- a/m4/unlinkdir.m4
+++ b/m4/unlinkdir.m4
@@ -1,6 +1,6 @@
-#serial 3
+#serial 4
 
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,6 @@ AC_DEFUN([gl_UNLINKDIR],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_HEADERS_ONCE(priv.h)
 
-  AC_LIBSOURCES([unlinkdir.c, unlinkdir.h])
   AC_LIBOBJ([unlinkdir])
 
   # The Hurd, the Linux kernel, the FreeBSD kernel version 2.2 and later,
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index f58e960156..20b2da2da7 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,4 +1,4 @@
-# unlocked-io.m4 serial 13
+# unlocked-io.m4 serial 14
 
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
@@ -17,8 +17,6 @@ dnl on Solaris 2.6).
 
 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,
diff --git a/m4/userspec.m4 b/m4/userspec.m4
index 92a22d6059..ce981e94c6 100644
--- a/m4/userspec.m4
+++ b/m4/userspec.m4
@@ -1,12 +1,11 @@
-#serial 8
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 9
+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.
 
 AC_DEFUN([gl_USERSPEC],
 [
-  AC_LIBSOURCES([userspec.c, userspec.h, intprops.h])
   AC_LIBOBJ([userspec])
 
   dnl Prerequisites of lib/userspec.c.
diff --git a/m4/utimecmp.m4 b/m4/utimecmp.m4
index ba02d53a64..e448ac1783 100644
--- a/m4/utimecmp.m4
+++ b/m4/utimecmp.m4
@@ -1,12 +1,11 @@
-#serial 1
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#serial 2
+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,
 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.
diff --git a/m4/utimens.m4 b/m4/utimens.m4
index 10f682191a..97a99ea25c 100644
--- a/m4/utimens.m4
+++ b/m4/utimens.m4
@@ -1,11 +1,10 @@
-dnl Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 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.
 
 AC_DEFUN([gl_UTIMENS],
 [
-  AC_LIBSOURCES([utimens.c, utimens.h])
   AC_LIBOBJ([utimens])
 
   dnl Prerequisites of lib/utimens.c.
diff --git a/m4/xalloc.m4 b/m4/xalloc.m4
index c0847dd37e..0bb1e638ff 100644
--- a/m4/xalloc.m4
+++ b/m4/xalloc.m4
@@ -1,12 +1,11 @@
-# xalloc.m4 serial 12
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# xalloc.m4 serial 13
+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.
 
 AC_DEFUN([gl_XALLOC],
 [
-  AC_LIBSOURCES([xmalloc.c, xalloc.h])
   AC_LIBOBJ([xmalloc])
 
   gl_PREREQ_XALLOC
diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4
index 025b51c948..d8609d124c 100644
--- a/m4/xgetcwd.m4
+++ b/m4/xgetcwd.m4
@@ -1,12 +1,11 @@
-#serial 5
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#serial 6
+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.
 
 AC_DEFUN([gl_XGETCWD],
 [
-  AC_LIBSOURCES([xgetcwd.c, xgetcwd.h])
   AC_LIBOBJ([xgetcwd])
 
   AC_REQUIRE([gl_FUNC_GETCWD])
diff --git a/m4/xnanosleep.m4 b/m4/xnanosleep.m4
index 360a4f5cbe..0cad79085d 100644
--- a/m4/xnanosleep.m4
+++ b/m4/xnanosleep.m4
@@ -1,5 +1,5 @@
-#serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 4
+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,6 +8,5 @@ dnl Written by Paul Eggert.
 
 AC_DEFUN([gl_XNANOSLEEP],
 [
-  AC_LIBSOURCES([xnanosleep.c, xnanosleep.h, intprops.h])
   AC_LIBOBJ([xnanosleep])
 ])
diff --git a/m4/xreadlink.m4 b/m4/xreadlink.m4
index c59b4a7349..a6fc3ae95d 100644
--- a/m4/xreadlink.m4
+++ b/m4/xreadlink.m4
@@ -1,12 +1,11 @@
-#serial 7
-dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#serial 8
+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.
 
 AC_DEFUN([gl_XREADLINK],
 [
-  AC_LIBSOURCES([xreadlink.c, xreadlink.h])
   AC_LIBOBJ([xreadlink])
 
   dnl Prerequisites of lib/xreadlink.c.
diff --git a/m4/xstrtod.m4 b/m4/xstrtod.m4
index e9c94ca68e..625e19c9d0 100644
--- a/m4/xstrtod.m4
+++ b/m4/xstrtod.m4
@@ -1,4 +1,4 @@
-#serial 5
+#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,
@@ -7,13 +7,11 @@ dnl with or without modifications, as long as this notice is preserved.
 # Prerequisites of lib/xstrtod.c.
 AC_DEFUN([gl_XSTRTOD],
 [
-  AC_LIBSOURCES([xstrtod.c, xstrtod.h])
   AC_LIBOBJ([xstrtod])
 ])
 
 # Prerequisites of lib/xstrtold.c.
 AC_DEFUN([gl_XSTRTOLD],
 [
-  AC_LIBSOURCES([xstrtold.c, xstrtod.c, xstrtod.h])
   AC_LIBOBJ([xstrtold])
 ])
diff --git a/m4/yesno.m4 b/m4/yesno.m4
index 6e8078df47..3506217d97 100644
--- a/m4/yesno.m4
+++ b/m4/yesno.m4
@@ -1,12 +1,11 @@
-# yesno.m4 serial 4
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# yesno.m4 serial 5
+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.
 
 AC_DEFUN([gl_YESNO],
 [
-  AC_LIBSOURCES([yesno.c, yesno.h])
   AC_LIBOBJ([yesno])
 
   dnl No prerequisites of lib/yesno.c.