changeset 4136:418fc7a9b27f

Update according to m4/ changes.
author Bruno Haible <bruno@clisp.org>
date Tue, 07 Jan 2003 13:16:07 +0000
parents 170410216f79
children 723a376ddac5
files MODULES.txt
diffstat 1 files changed, 239 insertions(+), 344 deletions(-) [+]
line wrap: on
line diff
--- a/MODULES.txt
+++ b/MODULES.txt
@@ -13,51 +13,47 @@
 <assert.h>      ---                   assert.m4                   ---
                                       jm_ASSERT
 
-<stdlib.h>      atexit.c              AC_REPLACE_FUNCS(atexit)    ---
+<stdlib.h>      atexit.c              atexit.m4                   ---
+                                      gl_FUNC_ATEXIT
 
-<stdlib.h>      strtod.c              AC_REPLACE_FUNCS(strtod)    ---
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(float.h)
-                                      AC_CHECK_FUNCS(isascii)
-                                      AC_CHECK_LIB(m, pow, ...)
+<stdlib.h>      strtod.c              strtod.m4                   ---
+                                      gl_FUNC_STRTOD
 
-<stdlib.h>      strtol.c              AC_REPLACE_FUNCS(strtol)    ---
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_CHECK_FUNCS(isascii)
+<stdlib.h>      strtol.c              strtol.m4                   ---
+                                      gl_FUNC_STRTOL
 
-<stdlib.h>      strtoul.c             AC_REPLACE_FUNCS(strtoul)   strtol
+<stdlib.h>      strtoul.c             strtoul.m4                  strtol
+                                      gl_FUNC_STRTOUL
 
-<string.h>      memchr.c              AC_REPLACE_FUNCS(memchr)    ---
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      see also jm_PREREQ_MEMCHR
+<string.h>      memchr.c              memchr.m4                   ---
+                                      gl_FUNC_MEMCHR
 
 <string.h>      memcmp.c              memcmp.m4                   ---
                                       jm_FUNC_MEMCMP
-                                      AC_CHECK_HEADERS(string.h)
 
-<string.h>      memcpy.c              AC_REPLACE_FUNCS(memcpy)    ---
+<string.h>      memcpy.c              memcpy.m4                   ---
+                                      gl_FUNC_MEMCPY
 
-<string.h>      memmove.c             AC_REPLACE_FUNCS(memmove)   ---
+<string.h>      memmove.c             memmove.m4                  ---
+                                      gl_FUNC_MEMMOVE
 
-<string.h>      memset.c              AC_REPLACE_FUNCS(memset)    ---
-
-<string.h>      strcspn.c             AC_REPLACE_FUNCS(strcspn)   ---
-                                      AC_CHECK_HEADERS(string.h)
+<string.h>      memset.c              memset.m4                   ---
+                                      gl_FUNC_MEMSET
 
-strpbrk.h       strpbrk.c             AC_REPLACE_FUNCS(strpbrk)   ---
-                                      AC_CHECK_HEADERS(string.h)
+<string.h>      strcspn.c             strcspn.m4                  ---
+                                      gl_FUNC_STRCSPN
 
-strstr.h        strstr.c              AC_REPLACE_FUNCS(strstr)    ---
-                                      AC_CHECK_HEADERS(string.h)
+strpbrk.h       strpbrk.c             strpbrk.m4                  ---
+                                      gl_FUNC_STRPBRK
 
-<string.h>      strerror.c            AC_REPLACE_FUNCS(strerror)  ---
+strstr.h        strstr.c              strstr.m4                   ---
+                                      gl_FUNC_STRSTR
 
-<time.h>        mktime.c              AC_FUNC_MKTIME              ---
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(limits.h)
-                                      see also jm_FUNC_MKTIME
+<string.h>      strerror.c            strerror.m4                 ---
+                                      gl_FUNC_STRERROR
+
+<time.h>        mktime.c              mktime.m4                   ---
+                                      gl_FUNC_MKTIME
 
 -------------------------------------------------------------------------------
 
@@ -74,13 +70,9 @@
 
 <stdlib.h>      malloc.c              malloc.m4                   ---
                                       jm_FUNC_MALLOC
-                                      or autoconf >= 2.57
-                                      AC_FUNC_MALLOC
 
 <stdlib.h>      realloc.c             realloc.m4                  ---
                                       jm_FUNC_REALLOC
-                                      or autoconf >= 2.57
-                                      AC_FUNC_REALLOC
 
 -------------------------------------------------------------------------------
 
@@ -105,12 +97,13 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-xalloc.h        xmalloc.c             AC_STDC_HEADERS             malloc
-                xstrdup.c             AC_CHECK_HEADERS(string.h)  realloc
+xalloc.h        xmalloc.c             xalloc.m4                   malloc
+                xstrdup.c             gl_XALLOC                   realloc
                                                                   error
                                                                   gettext
 
-30 lines        alloca.c              AC_FUNC_ALLOCA              xalloc
+30 lines        alloca.c              alloca.m4                   xalloc
+                                      gl_FUNC_ALLOCA
 
 bumpalloc.h     ---                   ---                         xalloc
 
@@ -136,14 +129,9 @@
 
 NYI             putenv.c              putenv.m4                   ---
                                       jm_FUNC_PUTENV
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_FUNCS(strchr)
-                                      AC_CHECK_FUNCS(memcpy)
 
 setenv.h        setenv.c              setenv.m4                   ---
                 unsetenv.c            gt_FUNC_SETENV
-                                      AC_FUNC_ALLOCA
 
 -------------------------------------------------------------------------------
 
@@ -158,33 +146,23 @@
 
 NYI             bcopy.c               AC_REPLACE_FUNCS(bcopy)     ---
 
-NYI             memrchr.c             AC_REPLACE_FUNCS(memrchr)   ---
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_GNU_SOURCE
+NYI             memrchr.c             memrchr.m4                  ---
+                                      gl_FUNC_MEMRCHR
 
-stpcpy.h        stpcpy.c              AC_REPLACE_FUNCS(stpcpy)    ---
-                                      AC_GNU_SOURCE
+stpcpy.h        stpcpy.c              stpcpy.m4                   ---
+                                      gl_FUNC_STPCPY
 
-strcase.h       strcasecmp.c          AC_REPLACE_FUNCS(strcasecmp)  ---
-                strncasecmp.c         AC_REPLACE_FUNCS(strncasecmp)
-
-NYI             strdup.c              AC_REPLACE_FUNCS(strdup)    ---
-                                      AC_STDC_HEADERS
+strcase.h       strcasecmp.c          strcase.m4                  ---
+                strncasecmp.c         gl_STRCASE
 
-NYI             strndup.c             AC_REPLACE_FUNCS(strndup)   strnlen
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_DECLS(strnlen)
-                                      AC_GNU_SOURCE
+NYI             strdup.c              strdup.m4                   ---
+                                      gl_FUNC_STRDUP
 
-NYI             strnlen.c             AC_REPLACE_FUNCS(strnlen)   ---
-                                      AC_FUNC_STRNLEN
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(memory.h)
-                                      AC_CHECK_DECLS(memchr)
-                                      AC_GNU_SOURCE
-                                      see also jm_PREREQ_STRNLEN
+NYI             strnlen.c             strnlen.m4                  ---
+                                      gl_FUNC_STRNLEN
+
+NYI             strndup.c             strndup.m4                  strnlen
+                                      gl_FUNC_STRNDUP
 
 -------------------------------------------------------------------------------
 
@@ -195,21 +173,11 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-xstrtod.h       xstrtod.c             AC_STDC_HEADERS             ---
+xstrtod.h       xstrtod.c             xstrtod.m4                  ---
+                                      gl_XSTRTOD
 
-xstrtol.h       xstrtol.c             xstrtoimax.m4               ---
-                xstrtoul.c            xstrtoumax.m4
-                xstrtoimax.c          AC_STDC_HEADERS
-                xstrtoumax.c          AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_CHECK_HEADERS(inttypes.h)
-                                      AC_CHECK_FUNCS(isascii)
-                                      AC_CHECK_DECLS(strtol)
-                                      AC_CHECK_DECLS(strtoul)
-                                      AC_CHECK_DECLS(strtoimax)
-                                      AC_CHECK_DECLS(strtoumax)
-                                      see also jm_AC_PREREQ_XSTRTOIMAX
-                                      see also jm_AC_PREREQ_XSTRTOUMAX
+xstrtol.h       xstrtol.c             xstrtol.m4 et al.           ---
+                xstrtoul.c            gl_XSTRTOL
 
 -------------------------------------------------------------------------------
 
@@ -220,16 +188,8 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-getdate.h       getdate.y             bison.m4                    unlocked-io
-                                      AC_STDC_HEADERS
-                                      AC_HEADER_TIME
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(sys/time.h)
-                                      AC_CHECK_FUNCS(isascii)
-                                      AC_STRUCT_TIMEZONE
-                                      HAVE_TM_GMTOFF see strftime.m4
-                                      jm_BISON
+getdate.h       getdate.y             m4/getdate.m4 et al.        unlocked-io
+                                      gl_GETDATE
 
 -------------------------------------------------------------------------------
 
@@ -240,9 +200,8 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-unlocked-io.h   ---                   jm-glibc-io.m4              ---
+unlocked-io.h   ---                   unlocked-io.m4              ---
                                       jm_FUNC_GLIBC_UNLOCKED_IO
-                                      AC_GNU_SOURCE
 
 -------------------------------------------------------------------------------
 
@@ -262,7 +221,8 @@
 version-etc.h   version-etc.c         ---                         unlocked-io
                                                                   gettext
 
-long-options.h  long-options.c        AC_CHECK_HEADERS(stdlib.h)  version-etc
+long-options.h  long-options.c        long-options.m4             version-etc
+                                      gl_LONG_OPTIONS
 
 -------------------------------------------------------------------------------
 
@@ -273,12 +233,11 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-md5.h           md5.c                 AC_STDC_HEADERS             unlocked-io
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_CHECK_FUNCS(memcpy)
+md5.h           md5.c                 md5.m4                      unlocked-io
+                                      gl_MD5
 
-sha.h           sha.c                 AC_STDC_HEADERS             unlocked-io
-                                      AC_CHECK_FUNCS(memcpy)      md5
+sha.h           sha.c                 sha.m4                      unlocked-io
+                                      gl_SHA                      md5
 
 -------------------------------------------------------------------------------
 
@@ -291,33 +250,29 @@
 
 diacrit.h       diacrit.c             ---                         ---
 
-getstr.h        getstr.c              AC_STDC_HEADERS             unlocked-io
+getstr.h        getstr.c              getstr.m4                   unlocked-io
+                                      gl_GETSTR
 
 getline.h       getline.c             getline.m4                  getstr
                                       AM_FUNC_GETLINE
-                                      AC_CHECK_FUNCS(getdelim)
-                                      AC_GNU_SOURCE
 
 linebuffer.h    linebuffer.c          ---                         xalloc
                                                                   unlocked-io
 
-obstack.h       obstack.c             AC_CHECK_HEADERS(stddef.h)  gettext
-                                      AC_CHECK_HEADERS(string.h)
+obstack.h       obstack.c             obstack.m4                  gettext
+                                      gl_OBSTACK
 
 hash-pjw.h      hash-pjw.c            ---                         ---
 
-hash.h          hash.c                AC_CHECK_HEADERS(stdlib.h)  malloc
-                                      AC_HEADER_STDBOOL           realloc
-                                      AC_CHECK_DECLS(malloc)
-                                      AC_CHECK_DECLS(free)
-                                      see also jm_PREREQ_HASH
+hash.h          hash.c                hash.m4                     malloc
+                                      gl_HASH                     realloc
+                                                                  stdbool
 
-readtokens.h    readtokens.c          AC_STDC_HEADERS             xalloc
-                                      AC_CHECK_HEADERS(string.h)  unlocked-io
-                                      AC_CHECK_HEADERS(memory.h)
+readtokens.h    readtokens.c          readtokens.m4               xalloc
+                                      gl_READTOKENS               unlocked-io
 
-strverscmp.h    strverscmp.c          AC_REPLACE_FUNCS(strverscmp) ---
-                                      AC_GNU_SOURCE
+strverscmp.h    strverscmp.c          strverscmp.m4               ---
+                                      gl_FUNC_STRVERSCMP
 
 -------------------------------------------------------------------------------
 
@@ -342,9 +297,11 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-<stdlib.h>      strtoll.c             AC_REPLACE_FUNCS(strtoll)   strtol
+<stdlib.h>      strtoll.c             strtoll.m4                  strtol
+                                      gl_FUNC_STRTOLL
 
-<stdlib.h>      strtoull.c            AC_REPLACE_FUNCS(strtoull)  strtoul
+<stdlib.h>      strtoull.c            strtoull.m4                 strtoul
+                                      gl_FUNC_STRTOULL
 
 -------------------------------------------------------------------------------
 
@@ -355,19 +312,11 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-NYI             strtoimax.c           longlong.m4                 ---
-                                      AC_CHECK_HEADERS(inttypes.h)
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_DECLS(strtol)
-                                      AC_CHECK_DECLS(strtoll)
-                                      jm_AC_TYPE_LONG_LONG
+NYI             strtoimax.c           strtoimax.m4 et al.         ---
+                                      gl_FUNC_STRTOIMAX
 
-NYI             strtoumax.c           longlong.m4                 ---
-                                      AC_CHECK_HEADERS(inttypes.h)
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_DECLS(strtoul)
-                                      AC_CHECK_DECLS(strtoull)
-                                      jm_AC_TYPE_UNSIGNED_LONG_LONG
+NYI             strtoumax.c           strtoumax.m4 et al.         strtoimax
+                                      gl_FUNC_STRTOUMAX
 
 -------------------------------------------------------------------------------
 
@@ -382,11 +331,19 @@
 
 * Extra functions based on ISO C 99.
 
++ Numeric conversion functions <stdlib.h>
+
 -------------------------------------------------------------------------------
 lib/            lib/                  m4/
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
+"xstrtol.h"     xstrtoimax.c          xstrtoimax.m4               xstrtol
+                                      jm_XSTRTOIMAX               strtoimax
+
+"xstrtol.h"     xstrtoumax.c          xstrtoumax.m4               xstrtol
+                                      jm_XSTRTOUMAX               strtoumax
+
 -------------------------------------------------------------------------------
 
 * Support for systems lacking POSIX:2001.
@@ -399,9 +356,8 @@
 <unistd.h>      chown.c               chown.m4                    ---
                                       jm_FUNC_CHOWN
 
-<unistd.h>      dup2.c                AC_REPLACE_FUNCS(dup2)      ---
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_HEADERS(fcntl.h)
+<unistd.h>      dup2.c                dup2.m4                     ---
+                                      gl_FUNC_DUP2
 
 <unistd.h>      ftruncate.c           ftruncate.m4                ---
                                       jm_FUNC_FTRUNCATE
@@ -413,47 +369,32 @@
                                       AC_FUNC_GETTIMEOFDAY_CLOBBER
 
 <sys/stat.h>    mkdir.c               mkdir-slash.m4              xalloc
-                                      AC_CHECK_HEADERS(stdlib.h)  dirname
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_DECLS(free)
-                                      UTILS_FUNC_MKDIR_TRAILING_SLASH
+                                      UTILS_FUNC_MKDIR_TRAILING_SLASH dirname
 
-<stdlib.h>      mkstemp.c             mkstemp.m4                  ---
+<stdlib.h>      mkstemp.c             mkstemp.m4 et al.           ---
                 tempname.c            UTILS_FUNC_MKSTEMP
-                                      jm_PREREQ_TEMPNAME
 
 <sys/stat.h>    stat.c                stat.m4                     ---
                                       jm_FUNC_STAT
 
 <sys/stat.h>    lstat.c               lstat.m4                    stat
                                       jm_FUNC_LSTAT               xalloc
-                                      AC_HEADER_STAT
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_DECLS(free)
 
-timespec.h      ---                   timespec.m4                 ---
-                                      st_mtim.m4
-                                      AC_CHECK_HEADERS(sys/time.h)
-                                      jm_CHECK_TYPE_STRUCT_TIMESPEC
-                                      AC_STRUCT_ST_MTIM_NSEC
-                                      AC_CHECK_DECLS(nanosleep)
+timespec.h      ---                   timespec.m4 et al.          ---
+                                      gl_TIMESPEC
 
 <time.h>        nanosleep.c           nanosleep.m4                timespec
                 timespec.h (BAD)      jm_FUNC_NANOSLEEP
-                                      AC_CHECK_HEADERS(unistd.h)
 
 regex.h         regex.c               regex.m4                    alloca
-                                      jm_INCLUDED_REGEX           unlocked-io
-                                      jm_PREREQ_REGEX             gettext
+                                      gl_REGEX                    unlocked-io
+                                                                  gettext
 
 <stdio.h>       rename.c              rename.m4                   xalloc
                                       vb_FUNC_RENAME              dirname
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_DECLS(free)
 
-<unistd.h>      rmdir.c               AC_REPLACE_FUNCS(rmdir)     ---
-                                      AC_HEADER_STAT
+<unistd.h>      rmdir.c               rmdir.m4                    ---
+                                      gl_FUNC_RMDIR
 
 <utime.h>       utime.c               utime.m4                    safe-read
                                       utimbuf.m4                  full-write
@@ -469,30 +410,31 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-dirname.h       dirname.c             dos.m4                      xalloc
-                basename.c            jm_AC_DOS
-                stripslash.c          jm_PREREQ_DIRNAME
+dirname.h       dirname.c             dirname.m4                  xalloc
+                basename.c            dos.m4
+                stripslash.c          gl_DIRNAME
 
-getopt.h        getopt.c              AC_CHECK_HEADERS(string.h)  gettext
-                getopt1.c
+getopt.h        getopt.c              getopt.m4                   gettext
+                getopt1.c             gl_GETOPT
 
-unistd-safer.h  dup-safer.c           AC_CHECK_HEADERS(unistd.h)  ---
-                                      AC_CHECK_HEADERS(fcntl.h)
+unistd-safer.h  dup-safer.c           unistd-safer.m4             ---
+                                      gl_UNISTD_SAFER
 
-fnmatch_.h      fnmatch.c             fnmatch.m4                  alloca
-                fnmatch_loop.c        mbstate_t.m4
-                                      AC_FUNC_FNMATCH_GNU
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(strings.h)
+---             fnmatch_.h            fnmatch.m4                  alloca
+                fnmatch.c             mbstate_t.m4
+                fnmatch_loop.c
+
+"fnmatch.h"     ---                   gl_FUNC_FNMATCH_POSIX       fnmatch
+(POSIX)
 
-exclude.h       exclude.c             jm_PREREQ_EXCLUDE           xalloc
-                                      AC_CHECK_HEADERS(stdlib.h)  strcase
-                                      AC_CHECK_HEADERS(string.h)  unlocked-io
-                                      AC_CHECK_HEADERS(strings.h) fnmatch
-                                      AC_CHECK_HEADERS(sys/types.h)
-                                      AC_CHECK_HEADERS(inttypes.h)
-                                      AC_CHECK_HEADERS(stdint.h)
+"fnmatch.h"     ---                   gl_FUNC_FNMATCH_GNU         fnmatch
+(GNU)
+
+exclude.h       exclude.c             exclude.m4                  xalloc
+                                      gl_EXCLUDE                  strcase
+                                                                  unlocked-io
+                                                                  fnmatch-gnu
+                                                                  stdbool
 
 -------------------------------------------------------------------------------
 
@@ -505,12 +447,10 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-human.h         human.c               AC_CHECK_HEADERS(inttypes.h) gettext
-                                      AC_CHECK_HEADERS(string.h)   argmatch
-                                      AC_CHECK_HEADERS(limits.h)   error
-                                      AC_CHECK_HEADERS(stdlib.h)   xstrtol
-                                      AC_CHECK_DECLS(getenv)
-                                      jm_PREREQ_HUMAN
+human.h         human.c               human.m4 et al.              gettext
+                                      gl_HUMAN                     argmatch
+                                                                   error
+                                                                   xstrtol
 
 -------------------------------------------------------------------------------
 
@@ -524,111 +464,74 @@
 acl.h           acl.c                 acl.m4                      ---
                                       AC_FUNC_ACL
 
-backupfile.h    backupfile.c          d-ino.m4                    argmatch
+backupfile.h    backupfile.c          backupfile.m4               argmatch
                 addext.c              dos.m4                      dirname
-                getversion.c          jm_PREREQ_ADDEXT
-                                      jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
-                                      jm_AC_DOS
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_DECLS(malloc)
-                                      AC_CHECK_DECLS(getenv)
+                                      d-ino.m4
+                                      gl_BACKUPFILE
 
-fsusage.h       fsusage.c             fsusage.m4                  full-read
-                                      jm_FILE_SYSTEM_USAGE
-                                      STATFS_TRUNCATES_BLOCK_COUNTS ?
-                                      jm_AC_TYPE_UINTMAX_T
-                                      AC_LIBOBJ(fsusage)
-                                      AC_CHECK_HEADERS(inttypes.h)
-                                      AC_CHECK_HEADERS(stdint.h)
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_CHECK_HEADERS(fcntl.h)
-                                      AC_CHECK_HEADERS(dustat.h)
-                                      AC_CHECK_HEADERS(sys/param.h)
-                                      AC_CHECK_HEADERS(sys/mount.h)
-                                      AC_CHECK_HEADERS(sys/vfs.h)
-                                      AC_CHECK_HEADERS(sys/fs/s5param.h)
-                                      AC_CHECK_HEADERS(sys/filsys.h)
-                                      AC_CHECK_HEADERS(sys/statfs.h)
-                                      AC_CHECK_HEADERS(sys/statvfs.h)
+fsusage.h       fsusage.c             fsusage.m4 et al.           full-read
+                                      gl_FSUSAGE
 
 dirfd.h         dirfd.c               dirfd.m4                    ---
                                       UTILS_FUNC_DIRFD
 
-NYI             euidaccess.c          AC_GNU_SOURCE               ---
-                                      AC_REPLACE_FUNCS(euidaccess)
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_FUNCS(getgroups)
+NYI             euidaccess.c          euidaccess.m4               group-member
+                                      gl_FUNC_EUIDACCESS
 
-file-type.h     file-type.c           AC_HEADER_STAT              gettext
+file-type.h     file-type.c           file-type.m4                gettext
+                                      gl_FILE_TYPE
 
-NYI             fileblocks.c          AC_STRUCT_ST_BLOCKS         ---
-(see coreutils/lib/system.h)          AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_HEADERS(sys/param.h)
+NYI             fileblocks.c          fileblocks.m4               ---
+(see coreutils/lib/system.h)          gl_FILEBLOCKS
 
-filemode.h      filemode.c            AC_HEADER_STAT              ---
+filemode.h      filemode.c            filemode.m4                 ---
+                                      gl_FILEMODE
 
-NYI             isdir.c               AC_HEADER_STAT              ---
+NYI             isdir.c               isdir.m4                    ---
+                                      gl_ISDIR
 
 NYI             lchown.h              lchown.m4                   chown
                 lchown.c              jm_FUNC_LCHOWN
-                                      AC_HEADER_STAT
 
-makepath.h      makepath.c            afs.m4                      alloca
-                                      AC_FUNC_ALLOCA              chown
-                                      AC_HEADER_STAT              gettext
-                                      AC_CHECK_HEADERS(unistd.h)  save-cwd
-                                      AC_CHECK_HEADERS(string.h)  dirname
+makepath.h      makepath.c            makepath.m4                 alloca
+                                      afs.m4                      chown
+                                      gl_MAKEPATH                 gettext
+                                                                  save-cwd
+                                                                  dirname
                                                                   error
                                                                   quote
 
-modechange.h    modechange.c          AC_CHECK_HEADERS            xstrtol
-                                      AC_HEADER_STAT
+modechange.h    modechange.c          modechange.m4               xstrtol
+                                      gl_MODECHANGE
 
-mountlist.h     mountlist.c           ls-mntd-fs.m4               xalloc
-                                      fstypename.m4               unlocked-io
-                                      jm_LIST_MOUNTED_FILESYSTEMS
-                                      jm_FSTYPENAME
-                                      AC_LIBOBJ(mountlist)
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(fcntl.h)
-                                      AC_CHECK_HEADERS(sys/mntent.h)
+mountlist.h     mountlist.c           mountlist.m4                xalloc
+                                      ls-mntd-fs.m4               unlocked-io
+                                      fstypename.m4
+                                      gl_MOUNTLIST
+
+path-concat.h   path-concat.c         path-concat.m4              strdup
+                                      dos.m4                      xalloc
+                                      gl_PATH_CONCAT              dirname
+
+pathmax.h       ---                   pathmax.m4                  ---
+                                      gl_PATHMAX
 
-path-concat.h   path-concat.c         dos.m4                      strdup
-                                      jm_AC_DOS                   xalloc
-                                      AC_STDC_HEADERS             dirname
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(strings.h)
-                                      AC_CHECK_HEADERS(memory.h)
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_FUNCS(mempcpy)
-                                      AC_CHECK_DECLS(malloc)
+same.h          same.c                same.m4                     xalloc
+                                      gl_SAME                     error
+                                                                  dirname
 
-pathmax.h       ---                   AC_CHECK_HEADERS(unistd.h)  ---
-                                      AC_CHECK_HEADERS(limits.h)
-                                      AC_CHECK_HEADERS(sys/param.h)
+save-cwd.h      save-cwd.c            save-cwd.m4                 error
+                                      gl_SAVE_CWD
 
-same.h          same.c                AC_CHECK_HEADERS(unistd.h)  xalloc
-                                      AC_CHECK_HEADERS(stdlib.h)  error
-                                      AC_CHECK_HEADERS(string.h)  dirname
-                                      AC_CHECK_DECLS(free)
+savedir.h       savedir.c             savedir.m4                  xalloc
+                                      gl_SAVEDIR
 
-save-cwd.h      save-cwd.c            AC_STDC_HEADERS             error
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_HEADERS(fcntl.h)
-                                      AC_CHECK_FUNCS(fchdir)
+xgetcwd.h       xgetcwd.c             xgetcwd.m4                  xalloc
+                                      getcwd.m4                   pathmax
+                                      gl_XGETCWD
 
-savedir.h       savedir.c             AC_STDC_HEADERS             xalloc
-                                      AC_DIR_HEADER
-                                      AC_FUNC_CLOSEDIR_VOID
-
-xgetcwd.h       xgetcwd.c             getcwd.m4                   xalloc
-                                      jm_PREREQ_XGETCWD           pathmax
-
-xreadlink.h     xreadlink.c           jm_PREREQ_XREADLINK         xalloc
+xreadlink.h     xreadlink.c           xreadlink.m4                xalloc
+                                      gl_XREADLINK
 
 -------------------------------------------------------------------------------
 
@@ -639,9 +542,11 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-safe-read.h     safe-read.c           AC_CHECK_HEADERS(unistd.h)  ---
+safe-read.h     safe-read.c           safe-read.m4                ---
+                                      gl_SAFE_READ
 
-safe-write.h    safe-write.c          ---                         safe-read
+safe-write.h    safe-write.c          safe-write.m4               safe-read
+                                      gl_SAFE_WRITE
 
 full-read.h     full-read.c           ---                         safe-read
 
@@ -659,16 +564,17 @@
 __fpending.h    __fpending.c          fpending.m4                 ---
                                       jm_FUNC_FPENDING
 
-closeout.h      closeout.c            AC_CHECK_HEADERS(stdlib.h)  unlocked-io
-                                                                  gettext
+closeout.h      closeout.c            closeout.m4                 unlocked-io
+                                      gl_CLOSEOUT                 gettext
                                                                   error
                                                                   quotearg
                                                                   fpending
 
-stdio-safer.h   fopen-safer.c         AC_CHECK_HEADERS(unistd.h)  unistd-safer
+stdio-safer.h   fopen-safer.c         stdio-safer.m4              unistd-safer
+                                      gl_STDIO_SAFER
 
-NYI             getpass.c             AC_REPLACE_FUNCS(getpass)   unlocked-io
-                                                                  getline
+NYI             getpass.c             getpass.m4                  unlocked-io
+                                      gl_FUNC_GETPASS             getline
 
 -------------------------------------------------------------------------------
 
@@ -679,28 +585,20 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-NYI             getugroups.c          AC_STDC_HEADERS             ---
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_TYPE_GETGROUPS
+NYI             getugroups.c          getugroups.m4               ---
+                                      gl_GETUGROUPS
 
 group-member.h  group-member.c        group-member.m4             xalloc
                                       jm_FUNC_GROUP_MEMBER
-                                      AC_STDC_HEADERS
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_FUNC_GETGROUPS
-                                      AC_GNU_SOURCE
+
+NYI             idcache.c             idcache.m4                  xalloc
+                                      gl_IDCACHE
 
-NYI             idcache.c             AC_STDC_HEADERS             xalloc
-                                      AC_CHECK_HEADERS(unistd.h)
-                                      AC_CHECK_HEADERS(string.h)
-
-NYI             userspec.c            AC_STDC_HEADERS             alloca
-                                      AC_FUNC_ALLOCA              xalloc
-                                      AC_CHECK_HEADERS(string.h)  xstrtol
-                                      AC_CHECK_HEADERS(limits.h)  strdup
-                                      AC_CHECK_HEADERS(unistd.h)  gettext
-                                      AC_CHECK_HEADERS(sys/param.h)
+NYI             userspec.c            userspec.m4                 alloca
+                                      gl_USERSPEC                 xalloc
+                                                                  xstrtol
+                                                                  strdup
+                                                                  gettext
 
 -------------------------------------------------------------------------------
 
@@ -711,18 +609,16 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-NYI             gettime.c             for clock_gettime           gettimeofday
-                timespec.h (BAD)      see jm-macros.m4
-
-NYI             settime.c             for clock_settime           ---
-                timespec.h (BAD)      see jm-macros.m4
+NYI             gettime.c             gettime.m4                  gettimeofday
+                timespec.h (BAD)      clock_time.m4               timespec
+                                      gl_GETTIME
 
-NYI             stime.c               ---                         ---
-                (TODO: remove)
+NYI             settime.c             settime.m4                  timespec
+                timespec.h (BAD)      clock_time.m4
+                                      gl_SETTIME
 
-posixtm.h       posixtm.c             AC_HEADER_TIME              unlocked-io
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_HEADERS(stdlib.h)
+posixtm.h       posixtm.c             posixtm.m4                  unlocked-io
+                                      gl_POSIXTM
 
 -------------------------------------------------------------------------------
 
@@ -733,15 +629,15 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-NYI             gethostname.c         AC_REPLACE_FUNCS(gethostname) ---
-                                      AC_CHECK_FUNCS(uname)
+NYI             gethostname.c         gethostname.m4              ---
+                                      gl_FUNC_GETHOSTNAME
 
 NYI             xgethostname.c        ---                         gehostname
                                                                   xalloc
                                                                   error
 
-NYI             canon-host.c          jm_PREREQ_CANON_HOST        ---
-                                      AC_CHECK_HEADERS(stdlib.h)
+NYI             canon-host.c          canon-host.m4               ---
+                                      gl_CANON_HOST
 
 -------------------------------------------------------------------------------
 
@@ -754,49 +650,45 @@
 
 gettext.h       libintl               gettext.m4 et al.           ---
                 (part of gettext)     (use gettextize)
-                                      AM_GNU_GETTEXT
+                                      AM_GNU_GETTEXT([external])
 
 <iconv.h>       libiconv              iconv.m4 et al.             ---
                 (part of libiconv)    AM_ICONV
 
-NYI             localcharset.c        codeset.m4                  ---
-                config.charset        glibc21.m4
-                ref-add.sin           AC_CANONICAL_HOST
-                ref-del.sin           jm_LANGINFO_CODESET
-                                      jm_GLIBC21
-                                      AC_CHECK_HEADERS(stddef.h)
-                                      AC_CHECK_HEADERS(stdlib.h)
-                                      AC_CHECK_HEADERS(string.h)
-                                      AC_CHECK_FUNCS(setlocale)
-                                      see libiconv/libcharset/INTEGRATE
+localcharset.h  localcharset.c        localcharset.m4             ---
+                config.charset        codeset.m4
+                ref-add.sin           glibc21.m4
+                ref-del.sin           gl_LOCALCHARSET
 
-hard-locale.h   hard-locale.c         jm_PREREQ_HARD_LOCALE       ---
+hard-locale.h   hard-locale.c         hard-locale.m4              ---
+                                      gl_HARD_LOCALE
 
 mbswidth.h      mbswidth.c            mbswidth.m4                 ---
                                       mbrtowc.m4
                                       mbstate_t.m4
-                                      jm_PREREQ_MBSWIDTH
+                                      gl_MBSWIDTH
 
-memcasecmp.h    memcasecmp.c          AC_STDC_HEADERS             ---
-                                      HAVE_ISASCII
+memcasecmp.h    memcasecmp.c          memcasecmp.m4               ---
+                                      gl_MEMCASECMP
 
-memcoll.h       memcoll.c             AC_CHECK_HEADERS(string.h)  ---
+memcoll.h       memcoll.c             memcoll.m4                  ---
+                                      gl_MEMCOLL
 
 xmemcoll.h      xmemcoll.c            ---                         memcoll
                                                                   gettext
                                                                   error
                                                                   quotearg
 
-unicodeio.h     unicodeio.c           AC_CHECK_HEADERS(stddef.h)  iconv
-                                      AC_CHECK_HEADERS(string.h)  gettext
+unicodeio.h     unicodeio.c           unicodeio.m4                iconv
+                                      gl_UNICODEIO                gettext
                                                                   localcharset
                                                                   error
 
-NYI             rpmatch.c             AC_REPLACE_FUNCS(rpmatch)   gettext
-                                      AC_STDC_HEADERS             regex
+<stdlib.h>+NYI  rpmatch.c             rpmatch.m4                  gettext
+                                      gl_FUNC_RPMATCH             regex
 
-NYI             yesno.c               AC_CHECK_HEADERS(stdlib.h)  unlocked-io
-                                                                  rpmatch
+NYI             yesno.c               yesno.m4                    unlocked-io
+                                      gl_YESNO                    rpmatch
 
 -------------------------------------------------------------------------------
 
@@ -811,43 +703,46 @@
 Header          Implementation        Autoconf macro              Depends on
 -------------------------------------------------------------------------------
 
-exitfail.h      exitfail.c            AC_CHECK_HEADERS(stdlib.h)  ---
+exitfail.h      exitfail.c            exitfail.m4                 ---
+                                      gl_EXITFAIL
 
 c-stack.h       c-stack.c             c-stack.m4                  gettext
-                                      jm_PREREQ_C_STACK
+                                      gl_C_STACK                  exitfail
 
 error.h         error.c               error.m4                    unlocked-io
-                                      strerror_r.m4               gettext
-                                      jm_PREREQ_ERROR
+                                      gl_ERROR                    gettext
 
-fatal.h         fatal.c               AC_STDC_HEADERS             unlocked-io
-                                      AC_CHECK_FUNCS(vprintf)     error
-                                      AC_CHECK_FUNCS(doprnt)
+fatal.h         fatal.c               fatal.m4                    unlocked-io
+                                      gl_FATAL                    error
 
 NYI             getloadavg.c          getloadavg.m4               ---
-                                      AC_FUNC_GETLOADAVG
+                                      gl_FUNC_GETLOADAVG
 
-getpagesize.h   ---                   jm_PREREQ_GETPAGESIZE       ---
+getpagesize.h   ---                   getpagesize.m4              ---
+                                      gl_GETPAGESIZE
 
-NYI             getusershell.c        AC_REPLACE_FUNCS(getusershell) xalloc
-                                      AC_CHECK_HEADERS(stdlib.h)  unlocked-io
-                                      AC_CHECK_FUNCS(isascii)
+NYI             getusershell.c        getusershell.m4             xalloc
+                                      gl_FUNC_GETUSERSHELL        unlocked-io
 
-physmem.h       physmem.c             jm_PREREQ_PHYSMEM           ---
+physmem.h       physmem.c             physmem.m4                  ---
+                                      gl_PHYSMEM
 
-posixver.h      posixver.c            jm_PREREQ_POSIXVER          ---
+posixver.h      posixver.c            posixver.m4                 ---
+                                      gl_POSIXVER
 
 quotearg.h      quotearg.c            mbrtowc.m4                  xalloc
-                                      jm_PREREQ_QUOTEARG          gettext
-                                      AC_CHECK_FUNCS(mbsinit)
-
-quote.h         quote.c               AC_CHECK_HEADERS(stddef.h)  quotearg
+                                      mbstate_t.m4                gettext
+                                      quotearg.m4
+                                      gl_QUOTEARG
 
-readutmp.h      readutmp.c            jm_PREREQ_READUTMP          xalloc
-                                      AC_CHECK_DECLS(getutent)    unlocked-io
+quote.h         quote.c               quote.m4                    quotearg
+                                      gl_QUOTE
 
-sig2str.h       sig2str.c             AC_REPLACE_FUNCS(sig2str)   ---
-                (TODO: use strsignal)
+readutmp.h      readutmp.c            readutmp.m4                 xalloc
+                                      gl_READUTMP                 unlocked-io
+
+sig2str.h       sig2str.c             sig2str.m4                  ---
+                                      gl_FUNC_SIG2STR
 
 -------------------------------------------------------------------------------