Add and change modules to make it easier for coreutils to use

gnulib-tool.

* lib/cycle-check.h: Include <stdint.h> unconditionally, since we
now assume the stdint module.  Do not include inttypes.h.
* lib/fsusage.h: Likewise.
* lib/getndelim2.c: Likewise.
* lib/human.h: Likewise.
* lib/inttostr.h: Likewise.
* lib/obstack.c: Likewise.
* lib/regex_internal.h: Likewise.
* lib/tempname.c: Likewise.
* lib/utimecmp.c: Likewise.
* lib/xstrtol.h: Likewise.

* lib/stat_.h: Fix typo: HAVE_FUNC_LSTAT -> HAVE_LSTAT.

* lib/strtoimax.c: Adjust to macro name changes in Autoconf,
e.g., HAVE_LONG_LONG -> HAVE_LONG_LONG_INT.
* lib/xtime.h: Likewise.

Remove files that are no longer needed by their respective modules.
* m4/obstack.m4: Remove.
* m4/strerror_r.m4: Remove.
* m4/uint32_t.m4: Remove.
* m4/uintptr_t.m4: Remove.
* m4/ullong_max.m4: Remove.
* m4/xstrtoimax.m4: Remove.
* m4/xstrtoumax.m4: Remove.

* cycle-check.m4 (gl_CYCLE_CHECK): Do not require gl_AC_TYPE_UINTMAX_T,
gl_STRUCT_DEV_INO, or gl_SAME_INODE, since gnulib dependencies now
capture this.

* cycle-check.m4 (gl_CYCLE_CHECK):
Do not use AC_LIBSOURCES, since gnulib modules now do this.
* fsusage.m4 (gl_FSUSAGE): Likewise.
* human.m4 (gl_HUMAN): Likewise.
* inttostr.m4 (gl_INTTOSTR): Likewise.
* xstrtol.m4 (gl_XSTRTOL): Likewise.

* filemode.m4 (gl_FILEMODE): Require AC_STRUCT_ST_DM_MODE.

* filemode.m4 (gl_PREREQ_FSUSAGE_EXTRA): Do not require
gl_AC_TYPE_INTMAX_T or gl_AC_TYPE_UINTMAX_T, since we now require
stdint.
* human.m4 (gl_HUMAN): Likewise.
* inttostr.m4 (gl_PREREQ_INTTOSTR): Likewise.
* mkstemp.m4 (gl_PREREQ_TEMPNAME): Likewise.
* strtoimax.m4 (gl_PREREQ_STRTOIMAX): Likewise.
* strtoumax.m4 (gl_PREREQ_STRTOUMAX): Likewise.
* xstrtol (gl_XSTRTOL): Likewise.

* gethrxtime.m4 (gl_XTIME): gl_AC_TYPE_LONG_LONG ->
AC_TYPE_LONG_LONG_INT.
* strtoimax.m4 (gl_PREREQ_STRTOIMAX): Likewise.
* strtoll.m4 (gl_FUNC_STRTOLL): Likewise.
* strtoull.m4 (gl_FUNC_STRTOULL): Likewise, for unsigned long.
* strtoumax.m4 (gl_PREREQ_STRTOUMAX): Likewise.

* human.m4 (gl_HUMAN): Do not require AM_STDBOOL_H since we depend
on stdbool.

* xstrtol.m4 (gl_PREREQ_XSTRTOL_H, gl_PREREQ_XSTRTOL): Remove.
(gl_PREREQ_XSTRTOUL): Remove.

* ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Check for hasmntopt.

* posixver.m4: Fix comment since head -1 now works even in POSIX mode.

* modules/backupfile (Files): Remove m4/d-ino.m4.
(Depends-on): Add d-ino.
* modules/cycle-check (Depends-on): Add stdint.
(lib_SOURCES): Add cycle-check.h.
* modules/d-ino: New module.
* modules/d-type: New module.
* modules/error (Files): Remove m4/strerror_r.m4.
* modules/filemode (Files): Add m4/st_dm_mode.m4.
* modules/fsuage (Files): Remove m4/ulonglong.m4, m4/stdint_h.m4,
m4/inttypes_h.m4, m4/uintmax_t.m4.
(Depends-on): Add stdint.
(lib_SOURCES): Add fsusage.h.
* modules/getcwd (Files): Remove d-ino.m4.
(Depends-on): Add d-ino.
* modules/getndelim2 (Depends-on): Add stdint.
* modules/glob (Files): Remove m4/d-type.m4.
(Depends-on): Add d-type.
* modules/host-os: New module.
* modules/human (Files):  Remove m4/ulonglong.m4, m4/stdint_h.m4,
m4/inttypes_h.m4, m4/uintmax_t.m4.
* Depends-on: Add stdint.
(lib_SOURCES): Add human.h.
* modules/inttostr (Files): Remove m4/intmax_t.m4,
m4/inttostr.m4, m4/inttypes_h.m4, m4/longlong.m4, m4/stdint_h.m4,
m4/uintmax_t.m4, m4/ulonglong.m4.
(Depends-on): Add stdint.
(EXTRA_DIST): Add inttostr.h.
* modules/lchmod: New module.
* modules/link-follow: New module.
* modules/mkdir-p (Files): Remove lib/lchmod.h, m4/lchmod.m4.
(Depends-on): Add lchmod.
* modules/mkstemp (Files): Remove m4/ulonglong.m4,
m4/stdint_h.m4, m4/inttypes_h.m4, m4/uintmax_t.m4.
(Depends-on): Add stdint.
* modules/obstack (Files): Remove m4/inttypes_h.m4, m4/obstack.m4,
m4/stdint_h.m4, m4/uintmax_t.m4, m4/ulonglong.m4.
(Depends-on): Add stdint.
(configure.ac): Change gl_OBSTACK to AC_FUNC_OBSTACK.
* modules/perl: New module.
* modules/regex (Depends-on): Add stdint.
* modules/rmdir-errno: New module.
* modules/strtoimax (Files): Remove m4/stdint_h.m4, m4/inttypes_h.m4,
m4/intmax_t.m4.
(Depends-on): Add stdint.
* modules/strtoumax (Files): Remove m4/stdint_h.m4, m4/inttypes_h.m4,
m4/uintmax_t.m4.
(Depends-on): Add stdint.
* modules/unlink-busy: New module.
* modules/utimecmp (Depends-on): Add stdint.
* modules/uptime: New module.
* modules/winsz-ioctl: New module.
* modules/winsz-termios: New module.
* modules/xnanosleep (Depends-on): Add nanosleep.
* modules/ullong_max: Remove.
* modules/xstrtoimax (Files): Remove m4/xstrtoimax.m4.
(configure.ac): Remove gl_XSTRTOIMAX; no action needed now.
* modules/xstrtol (Files): Remove m4/ulonglong.m4, m4/longlong.m4,
m4/stdint_h.m4, m4/inttypes_h.m4, m4/uintmax_t.m4, m4/intmax_t.m4.
(Depends-on): Add inttypes.
(lib_SOURCES): Add xstrtol.h.
* modules/xstrtoumax (Files): Remove m4/xstrtoumax.m4.
(configure.ac): Remove gl_XSTRTOUMAX; no action needed now.
* MODULES.html.sh: Move 'assert' into the assert section.
Move 'dummy' into the linking section.
Remove ullong_max.
Add section for compatibility checks for POSIX:2001 functions,
and put d-ino, d-type, link-follow, rmdir-errno, unlink-busy,
winsz-ioctl, and winsz-termios into it.
Add lchmod.
Add top-level Misc section and put host-os, perl, and uptime
into it.

33 files changed, 249 insertions, 72 deletions

diff --git a/modules/backupfile b/modules/backupfile
index e8fde212fe..bb140b5882 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -6,11 +6,11 @@ Files:
 lib/backupfile.h
 lib/backupfile.c
 m4/dos.m4
-m4/d-ino.m4
 m4/backupfile.m4
 
 Depends-on:
 argmatch
+d-ino
 dirname
 stdbool
 
diff --git a/modules/cycle-check b/modules/cycle-check
index e1dad68675..8421cc880f 100644
--- a/modules/cycle-check
+++ b/modules/cycle-check
@@ -10,11 +10,13 @@ Depends-on:
 dev-ino
 same-inode
 stdbool
+stdint
 
 configure.ac:
 gl_CYCLE_CHECK
 
 Makefile.am:
+lib_SOURCES += cycle-check.h
 
 Include:
 "cycle-check.h"
diff --git a/modules/d-ino b/modules/d-ino
new file mode 100644
index 0000000000..a83f3d9892
--- /dev/null
+++ b/modules/d-ino
@@ -0,0 +1,20 @@
+Description:
+Check whether struct dirent has a member named d_ino.
+
+Files:
+m4/d-ino.m4
+
+Depends-on:
+
+configure.ac:
+gl_CHECK_TYPE_STRUCT_DIRENT_D_INO
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/d-type b/modules/d-type
new file mode 100644
index 0000000000..8cc1c8e71c
--- /dev/null
+++ b/modules/d-type
@@ -0,0 +1,20 @@
+Description:
+Check whether struct dirent has a member named d_type.
+
+Files:
+m4/d-type.m4
+
+Depends-on:
+
+configure.ac:
+gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/error b/modules/error
index 77186074c9..4e999ca88e 100644
--- a/modules/error
+++ b/modules/error
@@ -5,7 +5,6 @@ Files:
 lib/error.h
 lib/error.c
 m4/error.m4
-m4/strerror_r.m4
 
 Depends-on:
 
diff --git a/modules/filemode b/modules/filemode
index b45e692e7b..02cd1215b7 100644
--- a/modules/filemode
+++ b/modules/filemode
@@ -6,6 +6,7 @@ Files:
 lib/filemode.h
 lib/filemode.c
 m4/filemode.m4
+m4/st_dm_mode.m4
 
 Depends-on:
 stat-macros
diff --git a/modules/fsusage b/modules/fsusage
index 2c961b2a4c..6e1eb53c52 100644
--- a/modules/fsusage
+++ b/modules/fsusage
@@ -4,20 +4,18 @@ Return file system space usage info.
 Files:
 lib/fsusage.h
 lib/fsusage.c
-m4/ulonglong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/uintmax_t.m4
 m4/fsusage.m4
 
 Depends-on:
 full-read
 stdbool
+stdint
 
 configure.ac:
 gl_FSUSAGE
 
 Makefile.am:
+lib_SOURCES += fsusage.h
 
 Include:
 "fsusage.h"
diff --git a/modules/getcwd b/modules/getcwd
index 0f38712013..35c6412577 100644
--- a/modules/getcwd
+++ b/modules/getcwd
@@ -4,13 +4,13 @@ Return the current working directory.
 Files:
 lib/getcwd.h
 lib/getcwd.c
-m4/d-ino.m4
 m4/getcwd-abort-bug.m4
 m4/getcwd-path-max.m4
 m4/getcwd.m4
 
 Depends-on:
 mempcpy
+d-ino
 extensions
 stdbool
 
diff --git a/modules/getndelim2 b/modules/getndelim2
index 1907d22362..6bd69b3d42 100644
--- a/modules/getndelim2
+++ b/modules/getndelim2
@@ -9,6 +9,7 @@ m4/getndelim2.m4
 
 Depends-on:
 ssize_t
+stdint
 
 configure.ac:
 gl_GETNDELIM2
diff --git a/modules/glob b/modules/glob
index 8317a67eae..8db534f6e6 100644
--- a/modules/glob
+++ b/modules/glob
@@ -6,11 +6,11 @@ Files:
 lib/glob_.h
 lib/glob-libc.h
 lib/glob.c
-m4/d-type.m4
 m4/glob.m4
 
 Depends-on:
 alloca
+d-type
 extensions
 fnmatch
 getlogin_r
diff --git a/modules/host-os b/modules/host-os
new file mode 100644
index 0000000000..12692dbf3a
--- /dev/null
+++ b/modules/host-os
@@ -0,0 +1,20 @@
+Description:
+Define HOST_OPERATING_SYSTEM to a name for the host operating system.
+
+Files:
+m4/host-os.m4
+
+Depends-on:
+
+configure.ac:
+gl_HOST_OS
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering
diff --git a/modules/human b/modules/human
index 838caececb..c0aa62caee 100644
--- a/modules/human
+++ b/modules/human
@@ -5,10 +5,6 @@ with K/M/G suffix.
 Files:
 lib/human.h
 lib/human.c
-m4/ulonglong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/uintmax_t.m4
 m4/human.m4
 
 Depends-on:
@@ -18,11 +14,13 @@ error
 intprops
 xstrtoumax
 stdbool
+stdint
 
 configure.ac:
 gl_HUMAN
 
 Makefile.am:
+lib_SOURCES += human.h
 
 Include:
 "human.h"
diff --git a/modules/inttostr b/modules/inttostr
index ed57e43c69..075a3e8b56 100644
--- a/modules/inttostr
+++ b/modules/inttostr
@@ -7,22 +7,17 @@ lib/inttostr.c
 lib/inttostr.h
 lib/offtostr.c
 lib/umaxtostr.c
-m4/intmax_t.m4
 m4/inttostr.m4
-m4/inttypes_h.m4
-m4/longlong.m4
-m4/stdint_h.m4
-m4/uintmax_t.m4
-m4/ulonglong.m4
 
 Depends-on:
 intprops
+stdint
 
 configure.ac:
 gl_INTTOSTR
 
 Makefile.am:
-EXTRA_DIST += inttostr.c
+EXTRA_DIST += inttostr.c inttostr.h
 
 Include:
 "inttostr.h"
diff --git a/modules/lchmod b/modules/lchmod
new file mode 100644
index 0000000000..78d7829e27
--- /dev/null
+++ b/modules/lchmod
@@ -0,0 +1,22 @@
+Description:
+lchmod that is actually chmod (!) on hosts lacking lchmod
+
+Files:
+lib/lchmod.h
+m4/lchmod.m4
+
+Depends-on:
+
+configure.ac:
+gl_FUNC_LCHMOD
+
+Makefile.am:
+
+Include:
+"lchown.h"
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering
diff --git a/modules/link-follow b/modules/link-follow
new file mode 100644
index 0000000000..15a19f4466
--- /dev/null
+++ b/modules/link-follow
@@ -0,0 +1,20 @@
+Description:
+Determine whether link("symlink", "foo") follows the symlink.
+
+Files:
+m4/link-follow.m4
+
+Depends-on:
+
+configure.ac:
+gl_AC_FUNC_LINK_FOLLOWS_SYMLINK
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/mkdir-p b/modules/mkdir-p
index 28cabda217..1e7dabed67 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -4,15 +4,14 @@ Ensure that a directory and its parents exist.
 Files:
 lib/dirchownmod.c
 lib/dirchownmod.h
-lib/lchmod.h
 lib/mkdir-p.c
 lib/mkdir-p.h
-m4/lchmod.m4
 m4/mkdir-p.m4
 
 Depends-on:
 error
 gettext-h
+lchmod
 lchown
 mkancesdirs
 quote
diff --git a/modules/mkstemp b/modules/mkstemp
index e56ced20da..4c090feaae 100644
--- a/modules/mkstemp
+++ b/modules/mkstemp
@@ -4,14 +4,11 @@ mkstemp() function: create a private temporary file.
 Files:
 lib/mkstemp.c
 lib/tempname.c
-m4/ulonglong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/uintmax_t.m4
 m4/mkstemp.m4
 
 Depends-on:
 stat-macros
+stdint
 sys_stat
 
 configure.ac:
diff --git a/modules/obstack b/modules/obstack
index 7eab2066ac..af12846b95 100644
--- a/modules/obstack
+++ b/modules/obstack
@@ -4,19 +4,16 @@ Memory allocation, optimized for stack-like allocation patterns.
 Files:
 lib/obstack.h
 lib/obstack.c
-m4/inttypes_h.m4
-m4/obstack.m4
-m4/stdint_h.m4
-m4/uintmax_t.m4
-m4/ulonglong.m4
 
 Depends-on:
 gettext-h
 exit
 exitfail
+stdint
 
 configure.ac:
-gl_OBSTACK
+AC_FUNC_OBSTACK
+dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]).
 
 Makefile.am:
 
diff --git a/modules/perl b/modules/perl
new file mode 100644
index 0000000000..017ba57a37
--- /dev/null
+++ b/modules/perl
@@ -0,0 +1,20 @@
+Description:
+Find a new-enough version of Perl.
+
+Files:
+m4/perl.m4
+
+Depends-on:
+
+configure.ac:
+gl_PERL
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/regex b/modules/regex
index 3f88f40515..5ca9a7f2d8 100644
--- a/modules/regex
+++ b/modules/regex
@@ -16,6 +16,7 @@ alloca
 extensions
 gettext-h
 malloc
+stdint
 strcase
 ssize_t
 
diff --git a/modules/rmdir-errno b/modules/rmdir-errno
new file mode 100644
index 0000000000..d0b81b6e53
--- /dev/null
+++ b/modules/rmdir-errno
@@ -0,0 +1,20 @@
+Description:
+rmdir errno for nonempty directories
+
+Files:
+m4/rmdir-errno.m4
+
+Depends-on:
+
+configure.ac:
+gl_FUNC_RMDIR_NOTEMPTY
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/strtoimax b/modules/strtoimax
index 2f5fe593b1..4e6da27f9b 100644
--- a/modules/strtoimax
+++ b/modules/strtoimax
@@ -4,15 +4,13 @@ strtoimax() function: convert string to 'intmax_t'.
 Files:
 lib/strtoimax.c
 m4/longlong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/intmax_t.m4
 m4/strtoimax.m4
 
 Depends-on:
 strtoll
 verify
 inttypes
+stdint
 
 configure.ac:
 gl_FUNC_STRTOIMAX
diff --git a/modules/strtoumax b/modules/strtoumax
index b8eadb4f0f..169f28f022 100644
--- a/modules/strtoumax
+++ b/modules/strtoumax
@@ -4,15 +4,13 @@ strtoumax() function: convert string to 'uintmax_t'.
 Files:
 lib/strtoumax.c
 m4/ulonglong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/uintmax_t.m4
 m4/strtoumax.m4
 
 Depends-on:
 strtoimax
 strtoull
 inttypes
+stdint
 
 configure.ac:
 gl_FUNC_STRTOUMAX
@@ -26,4 +24,3 @@ GPL
 
 Maintainer:
 Paul Eggert
-
diff --git a/modules/ullong_max b/modules/ullong_max
deleted file mode 100644
index e6648c17e8..0000000000
--- a/modules/ullong_max
+++ /dev/null
@@ -1,21 +0,0 @@
-Description:
-The maximum unsigned long long value, as a preprocessor constant.
-
-Files:
-m4/ullong_max.m4
-
-Depends-on:
-
-configure.ac:
-gl_ULLONG_MAX
-
-Makefile.am:
-
-Include:
-<limits.h>
-
-License:
-GPL
-
-Maintainer:
-Paul Eggert
diff --git a/modules/unlink-busy b/modules/unlink-busy
new file mode 100644
index 0000000000..96d7b31495
--- /dev/null
+++ b/modules/unlink-busy
@@ -0,0 +1,20 @@
+Description:
+Test whether a running program can be unlinked.
+
+Files:
+m4/unlink-busy.m4
+
+Depends-on:
+
+configure.ac:
+gl_FUNC_UNLINK_BUSY_TEXT
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/uptime b/modules/uptime
new file mode 100644
index 0000000000..93c5f4ae52
--- /dev/null
+++ b/modules/uptime
@@ -0,0 +1,20 @@
+Description:
+Test whether /proc/uptime might exist.
+
+Files:
+m4/uptime.m4
+
+Depends-on:
+
+configure.ac:
+gl_SYS_PROC_UPTIME
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/utimecmp b/modules/utimecmp
index af72a78bc5..a042393d78 100644
--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -14,6 +14,7 @@ utimens
 xalloc
 intprops
 stdbool
+stdint
 verify
 
 configure.ac:
diff --git a/modules/winsz-ioctl b/modules/winsz-ioctl
new file mode 100644
index 0000000000..9e1c37e2a7
--- /dev/null
+++ b/modules/winsz-ioctl
@@ -0,0 +1,21 @@
+Description:
+Test whether use of TIOCGWINSZ requires sys/ioctl.h.
+
+Files:
+m4/jm-winsz2.m4
+
+Depends-on:
+winsz-termios
+
+configure.ac:
+gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/winsz-termios b/modules/winsz-termios
new file mode 100644
index 0000000000..6e7e38bfeb
--- /dev/null
+++ b/modules/winsz-termios
@@ -0,0 +1,21 @@
+Description:
+Test whether use of TIOCGWINSZ requires termios.h.
+
+Files:
+m4/jm-winsz1.m4
+
+Depends-on:
+
+configure.ac:
+gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H
+gl_WINSIZE_IN_PTEM
+
+Makefile.am:
+
+Include:
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/xnanosleep b/modules/xnanosleep
index 5acf1d3894..fa063cb76a 100644
--- a/modules/xnanosleep
+++ b/modules/xnanosleep
@@ -7,6 +7,7 @@ lib/xnanosleep.c
 m4/xnanosleep.m4
 
 Depends-on:
+nanosleep
 timespec
 intprops
 stdbool
diff --git a/modules/xstrtoimax b/modules/xstrtoimax
index 190b13ecb3..3ab6623027 100644
--- a/modules/xstrtoimax
+++ b/modules/xstrtoimax
@@ -2,16 +2,13 @@ Description:
 Convert string to 'intmax_t', with error checking.
 
 Files:
-
 lib/xstrtoimax.c
-m4/xstrtoimax.m4
 
 Depends-on:
 xstrtol
 strtoimax
 
 configure.ac:
-gl_XSTRTOIMAX
 
 Makefile.am:
 lib_SOURCES += xstrtoimax.c
@@ -24,4 +21,3 @@ GPL
 
 Maintainer:
 Paul Eggert
-
diff --git a/modules/xstrtol b/modules/xstrtol
index f1faa0998d..128d6bd26a 100644
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -5,23 +5,19 @@ Files:
 lib/xstrtol.h
 lib/xstrtol.c
 lib/xstrtoul.c
-m4/ulonglong.m4
-m4/longlong.m4
-m4/stdint_h.m4
-m4/inttypes_h.m4
-m4/uintmax_t.m4
-m4/intmax_t.m4
 m4/xstrtol.m4
 
 Depends-on:
 exitfail
 error
 intprops
+inttypes
 
 configure.ac:
 gl_XSTRTOL
 
 Makefile.am:
+lib_SOURCES += xstrtol.h
 
 Include:
 "xstrtol.h"
diff --git a/modules/xstrtoumax b/modules/xstrtoumax
index 91891c0a09..0d8ad36f64 100644
--- a/modules/xstrtoumax
+++ b/modules/xstrtoumax
@@ -3,14 +3,12 @@ Convert string to 'uintmax_t', with error checking.
 
 Files:
 lib/xstrtoumax.c
-m4/xstrtoumax.m4
 
 Depends-on:
 xstrtol
 strtoumax
 
 configure.ac:
-gl_XSTRTOUMAX
 
 Makefile.am:
 lib_SOURCES += xstrtoumax.c
@@ -23,4 +21,3 @@ GPL
 
 Maintainer:
 Paul Eggert
-