Change jm_ to gl_ in AC_DEFINE'd names. Update all uses.

92 files changed, 283 insertions, 253 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e07772307..8ec04ebfda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-18  Jim Meyering  <jim@meyering.net>
+
+	Change jm_ to gl_ in AC_DEFINE'd names.
+	* modules/assert, modules/chown, modules/fpending:
+	* modules/ftruncate, modules/getgroups, modules/group-member:
+	* modules/lchown, modules/lstat, modules/memcmp:
+	* modules/nanosleep, modules/putenv, modules/stat:
+	* modules/strftime, modules/unlocked-io, modules/utime:
+	* modules/xstrtoimax, modules/xstrtoumax:
+
 2004-04-12  Paul Eggert  <eggert@twinsun.com>
 
 	* config/srclist.txt: Restore setenv.c, unsetenv.c from gettext.
diff --git a/doc/README b/doc/README
index c6999d9895..a50ddda19d 100644
--- a/doc/README
+++ b/doc/README
@@ -10,7 +10,7 @@ $GNULIBSRC/lib/mkstemp.c	lib
 then in configure.ac:
 AC_DEFUN([texinfo_MACROS],
 [
-  AC_REQUIRE([jm_PREREQ_TEMPNAME])dnl for mkstemp
+  AC_REQUIRE([gl_PREREQ_TEMPNAME])dnl for mkstemp
   AC_REQUIRE([UTILS_FUNC_MKSTEMP])
 ])dnl
 texinfo_MACROS
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 8a84b3eba0..9051bc9d1f 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,24 @@
+2004-04-18  Jim Meyering  <jim@meyering.net>
+
+	* prereq.m4: Don't forbid jm_ prefix.
+
+	* afs.m4, allocsa.m4, assert.m4, backupfile.m4, bison.m4:
+	* check-decl.m4, chown.m4, d-ino.m4, d-type.m4, dirname.m4, dos.m4:
+	* error.m4, fpending.m4, fstypename.m4, fsusage.m4, ftruncate.m4:
+	* getdate.m4, getgroups.m4, gettext.m4, glibc21.m4, group-member.m4:
+	* human.m4, intmax.m4, intmax_t.m4, inttostr.m4, inttypes.m4:
+	* inttypes_h.m4, jm-macros.m4, jm-winsz1.m4, jm-winsz2.m4, lchown.m4:
+	* lib-check.m4, link-follow.m4, localcharset.m4, longlong.m4:
+	* ls-mntd-fs.m4, lstat.m4, makepath.m4, mbrtowc.m4, mbswidth.m4:
+	* memchr.m4, memcmp.m4, mkdtemp.m4, mkstemp.m4, mountlist.m4:
+	* nanosleep.m4, path-concat.m4, perl.m4, prereq.m4, putenv.m4:
+	* quotearg.m4, regex.m4, stat.m4, stdint_h.m4, strftime.m4:
+	* strtoimax.m4, strtoll.m4, strtoull.m4, strtoumax.m4, timespec.m4:
+	* uintmax_t.m4, ulonglong.m4, unlink-busy.m4, unlocked-io.m4:
+	* uptime.m4, utimbuf.m4, utime.m4, utimes-null.m4, vasnprintf.m4:
+	* xstrtoimax.m4, xstrtol.m4, xstrtoumax.m4:
+	Change jm_ to gl_ in AC_DEFINE'd names. Update all uses.
+
 2004-04-16  Jim Meyering  <jim@meyering.net>
 
 	* prereq.m4 (jm_PREREQ_STAT): Remove macro.  It is specific to
diff --git a/m4/afs.m4 b/m4/afs.m4
index 9e7d773161..fa568ba93a 100644
--- a/m4/afs.m4
+++ b/m4/afs.m4
@@ -1,6 +1,6 @@
-#serial 5
+#serial 6
 
-AC_DEFUN([jm_AFS],
+AC_DEFUN([gl_AFS],
   [
     AC_MSG_CHECKING(for AFS)
     if test -d /afs; then
diff --git a/m4/allocsa.m4 b/m4/allocsa.m4
index a18576fec8..9ec0024484 100644
--- a/m4/allocsa.m4
+++ b/m4/allocsa.m4
@@ -1,4 +1,4 @@
-# allocsa.m4 serial 2
+# allocsa.m4 serial 3
 dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -12,6 +12,6 @@ AC_DEFUN([gl_ALLOCSA],
   dnl @ALLOCA@ and @LTALLOCA@.
   AC_REQUIRE([gl_FUNC_ALLOCA])
   AC_REQUIRE([gl_EEMALLOC])
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])
 ])
diff --git a/m4/assert.m4 b/m4/assert.m4
index 8ab60b1bdf..97315eea37 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,7 +1,7 @@
-#serial 3
+#serial 4
 dnl based on code from Eleftherios Gkioulekas
 
-AC_DEFUN([jm_ASSERT],
+AC_DEFUN([gl_ASSERT],
 [
   AC_MSG_CHECKING(whether to enable assertions)
   AC_ARG_ENABLE(assert,
diff --git a/m4/backupfile.m4 b/m4/backupfile.m4
index f3c2aa5d5d..4f7e43f28e 100644
--- a/m4/backupfile.m4
+++ b/m4/backupfile.m4
@@ -1,4 +1,4 @@
-# backupfile.m4 serial 3
+# backupfile.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -11,10 +11,10 @@ AC_DEFUN([gl_BACKUPFILE],
   dnl Prerequisites of lib/backupfile.c.
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
-  jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
+  gl_CHECK_TYPE_STRUCT_DIRENT_D_INO
 
   dnl Prerequisites of lib/addext.c.
-  AC_REQUIRE([jm_AC_DOS])
+  AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([AC_SYS_LONG_FILE_NAMES])
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_FUNCS(pathconf)
diff --git a/m4/bison.m4 b/m4/bison.m4
index 228ae4c5a6..c4854b273a 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,6 +1,6 @@
-#serial 2
+#serial 3
 
-AC_DEFUN([jm_BISON],
+AC_DEFUN([gl_BISON],
 [
   # getdate.y works with bison only.
   : ${YACC='bison -y'}
diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index 4a0fda0617..d70e1c90f8 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,11 +1,11 @@
-#serial 19
+#serial 20
 
 dnl This is just a wrapper function to encapsulate this kludge.
 dnl Putting it in a separate file like this helps share it between
 dnl different packages.
-AC_DEFUN([jm_CHECK_DECLS],
+AC_DEFUN([gl_CHECK_DECLS],
 [
-  AC_REQUIRE([_jm_DECL_HEADERS])
+  AC_REQUIRE([_gl_DECL_HEADERS])
   AC_REQUIRE([AC_HEADER_TIME])
   headers='
 #include <stdio.h>
@@ -67,7 +67,7 @@ AC_DEFUN([jm_CHECK_DECLS],
 
 dnl FIXME: when autoconf has support for it.
 dnl This is a little helper so we can require these header checks.
-AC_DEFUN([_jm_DECL_HEADERS],
+AC_DEFUN([_gl_DECL_HEADERS],
 [
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \
diff --git a/m4/chown.m4 b/m4/chown.m4
index 86c5fc7545..f723cb5765 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,11 +1,11 @@
-#serial 8
+#serial 9
 
 dnl From Jim Meyering.
 dnl Determine whether chown accepts arguments of -1 for uid and gid.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 
-AC_DEFUN([jm_FUNC_CHOWN],
+AC_DEFUN([gl_FUNC_CHOWN],
 [
   AC_REQUIRE([AC_TYPE_UID_T])dnl
   AC_REQUIRE([AC_FUNC_CHOWN])
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index d2555e90a1..56ce35e2c3 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,11 +1,11 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_ino.
 dnl
 
-AC_DEFUN([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO],
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
   [AC_REQUIRE([AC_HEADER_DIRENT])dnl
    AC_CACHE_CHECK([for d_ino member in directory struct],
 		  jm_cv_struct_dirent_d_ino,
diff --git a/m4/d-type.m4 b/m4/d-type.m4
index c69436d3c5..9c62198d51 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,11 +1,11 @@
-#serial 6
+#serial 7
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_type.
 dnl
 
-AC_DEFUN([jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
   [AC_REQUIRE([AC_HEADER_DIRENT])dnl
    AC_CACHE_CHECK([for d_type member in directory struct],
 		  jm_cv_struct_dirent_d_type,
diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 9a5e6f5f34..d0dacf1e06 100644
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,4 +1,4 @@
-# dirname.m4 serial 2
+# dirname.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 AC_DEFUN([gl_DIRNAME],
 [
   dnl Prerequisites of lib/dirname.h.
-  AC_REQUIRE([jm_AC_DOS])
+  AC_REQUIRE([gl_AC_DOS])
 
   dnl No prerequisites of lib/basename.c, lib/dirname.c, lib/stripslash.c.
 ])
diff --git a/m4/dos.m4 b/m4/dos.m4
index 868626e7e5..34cc739075 100644
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -1,11 +1,11 @@
-#serial 5
+#serial 6
 
 # Define some macros required for proper operation of code in lib/*.c
 # on MSDOS/Windows systems.
 
 # From Jim Meyering.
 
-AC_DEFUN([jm_AC_DOS],
+AC_DEFUN([gl_AC_DOS],
   [
     AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
       [
diff --git a/m4/error.m4 b/m4/error.m4
index 0bc2e6899d..da8fb513c6 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,14 +1,14 @@
-#serial 9
+#serial 10
 
 AC_DEFUN([gl_ERROR],
 [
   AC_FUNC_ERROR_AT_LINE
   dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
-  jm_PREREQ_ERROR
+  gl_PREREQ_ERROR
 ])
 
 # Prerequisites of lib/error.c.
-AC_DEFUN([jm_PREREQ_ERROR],
+AC_DEFUN([gl_PREREQ_ERROR],
 [
   AC_REQUIRE([AC_FUNC_STRERROR_R])
   :
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 145c86a0bc..d086ac635e 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 
 dnl From Jim Meyering
 dnl Using code from emacs, based on suggestions from Paul Eggert
@@ -8,7 +8,7 @@ dnl Find out how to determine the number of pending output bytes on a stream.
 dnl glibc (2.1.93 and newer) and Solaris provide __fpending.  On other systems,
 dnl we have to grub around in the FILE struct.
 
-AC_DEFUN([jm_FUNC_FPENDING],
+AC_DEFUN([gl_FUNC_FPENDING],
 [
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index 75723a14fb..f909a0d3c8 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 
 dnl From Jim Meyering.
 dnl
@@ -6,7 +6,7 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_F_FSTYPENAME_IN_STATFS.
 dnl
 
-AC_DEFUN([jm_FSTYPENAME],
+AC_DEFUN([gl_FSTYPENAME],
   [
     AC_CACHE_CHECK([for f_fstypename in struct statfs],
 		   fu_cv_sys_f_fstypename_in_statfs,
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index a0ab1e15f3..b0a283b113 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,4 +1,4 @@
-#serial 11
+#serial 12
 
 # From fileutils/configure.in
 
@@ -6,7 +6,7 @@ AC_DEFUN([gl_FSUSAGE],
 [
   AC_CHECK_HEADERS_ONCE(sys/param.h)
   AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs_types.h)
-  jm_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no])
+  gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no])
   if test $gl_cv_fs_space = yes; then
     AC_LIBOBJ(fsusage)
     gl_PREREQ_FSUSAGE_EXTRA
@@ -17,9 +17,9 @@ AC_DEFUN([gl_FSUSAGE],
 # If successful, define the appropriate symbol (see fsusage.c) and
 # execute ACTION-IF-FOUND.  Otherwise, execute ACTION-IF-NOT-FOUND.
 #
-# jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+# gl_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 
-AC_DEFUN([jm_FILE_SYSTEM_USAGE],
+AC_DEFUN([gl_FILE_SYSTEM_USAGE],
 [
 
 echo "checking how to get filesystem space usage..."
@@ -212,7 +212,7 @@ AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
 # Check for SunOS statfs brokenness wrt partitions 2GB and larger.
 # If <sys/vfs.h> exists and struct statfs has a member named f_spare,
 # enable the work-around code in fsusage.c.
-AC_DEFUN([jm_STATFS_TRUNCATES],
+AC_DEFUN([gl_STATFS_TRUNCATES],
 [
   AC_MSG_CHECKING([for statfs that truncates block counts])
   AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
@@ -236,11 +236,11 @@ choke -- this is a workaround for a Sun-specific problem
 ])
 
 
-# Prerequisites of lib/fsusage.c not done by jm_FILE_SYSTEM_USAGE.
+# Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE.
 AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
 [
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
   AC_CHECK_HEADERS_ONCE(fcntl.h)
   AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h)
-  jm_STATFS_TRUNCATES
+  gl_STATFS_TRUNCATES
 ])
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index ec593a96de..b2ce6dd568 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,8 +1,8 @@
-#serial 5
+#serial 6
 
 # See if we need to emulate a missing ftruncate function using fcntl or chsize.
 
-AC_DEFUN([jm_FUNC_FTRUNCATE],
+AC_DEFUN([gl_FUNC_FTRUNCATE],
 [
   AC_REPLACE_FUNCS(ftruncate)
   if test $ac_cv_func_ftruncate = no; then
diff --git a/m4/getdate.m4 b/m4/getdate.m4
index de38124023..6c0c9ff9a0 100644
--- a/m4/getdate.m4
+++ b/m4/getdate.m4
@@ -1,4 +1,4 @@
-# getdate.m4 serial 3
+# getdate.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -13,7 +13,7 @@ AC_DEFUN([gl_GETDATE],
   AC_REQUIRE([gl_TIMESPEC])
 
   dnl Prerequisites of lib/getdate.y.
-  AC_REQUIRE([jm_BISON])
+  AC_REQUIRE([gl_BISON])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_FUNCS_ONCE(isascii)
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 8f31010562..e7bf2c1834 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,9 +1,9 @@
-#serial 8
+#serial 9
 
 dnl From Jim Meyering.
 dnl A wrapper around AC_FUNC_GETGROUPS.
 
-AC_DEFUN([jm_FUNC_GETGROUPS],
+AC_DEFUN([gl_FUNC_GETGROUPS],
 [
   AC_REQUIRE([AC_FUNC_GETGROUPS])
   if test $ac_cv_func_getgroups_works = no; then
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a374f03fa5..a9225d3771 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 28 (gettext-0.13)
+# gettext.m4 serial 29
 dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -358,19 +358,19 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AC_C_INLINE])dnl
   AC_REQUIRE([AC_TYPE_OFF_T])dnl
   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
   AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
   AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_REQUIRE([gt_TYPE_INTMAX_T])
   AC_REQUIRE([gt_PRINTF_POSIX])
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gl_GLIBC21])dnl
   AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
   AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
   AC_REQUIRE([gt_INTTYPES_PRI])dnl
   AC_REQUIRE([gl_XSIZE])dnl
diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 9c9f3db303..32ca2242e0 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,5 +1,5 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 # Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
 
-AC_DEFUN([jm_GLIBC21],
+AC_DEFUN([gl_GLIBC21],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
       ac_cv_gnu_library_2_1,
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index bfef4809cb..c9fd3436b8 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,8 +1,8 @@
-#serial 5
+#serial 6
 
 dnl Written by Jim Meyering
 
-AC_DEFUN([jm_FUNC_GROUP_MEMBER],
+AC_DEFUN([gl_FUNC_GROUP_MEMBER],
 [
   dnl Persuade glibc <unistd.h> to declare group_member().
   AC_REQUIRE([AC_GNU_SOURCE])
diff --git a/m4/human.m4 b/m4/human.m4
index a2b2365700..3dbc16db5f 100644
--- a/m4/human.m4
+++ b/m4/human.m4
@@ -1,4 +1,4 @@
-# human.m4 serial 4
+# human.m4 serial 5
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,7 +10,7 @@ AC_DEFUN([gl_HUMAN],
 [
   dnl Prerequisites of lib/human.h.
   AC_REQUIRE([AM_STDBOOL_H])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
 
   dnl Prerequisites of lib/human.c.
   AC_CHECK_HEADERS_ONCE(locale.h)
diff --git a/m4/intmax.m4 b/m4/intmax.m4
index dfb08ccc9e..80f6526c6d 100644
--- a/m4/intmax.m4
+++ b/m4/intmax.m4
@@ -1,5 +1,5 @@
-# intmax.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# intmax.m4 serial 2
+dnl Copyright (C) 2002-2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -12,11 +12,11 @@ dnl find a replacement if it is lacking.
 
 AC_DEFUN([gt_TYPE_INTMAX_T],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
     [AC_TRY_COMPILE([
-#include <stddef.h> 
+#include <stddef.h>
 #include <stdlib.h>
 #if HAVE_STDINT_H_WITH_UINTMAX
 #include <stdint.h>
diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index 1dc190f687..434289fe60 100644
--- a/m4/intmax_t.m4
+++ b/m4/intmax_t.m4
@@ -1,4 +1,4 @@
-# intmax_t.m4 serial 2
+# intmax_t.m4 serial 3
 dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -13,14 +13,14 @@ AC_PREREQ(2.13)
 # Define intmax_t to 'long' or 'long long'
 # if it is not already defined in <stdint.h> or <inttypes.h>.
 
-AC_DEFUN([jm_AC_TYPE_INTMAX_T],
+AC_DEFUN([gl_AC_TYPE_INTMAX_T],
 [
   dnl For simplicity, we assume that a header file defines 'intmax_t' if and
   dnl only if it defines 'uintmax_t'.
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+    AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
     test $ac_cv_type_long_long = yes \
       && ac_type='long long' \
       || ac_type='long'
@@ -36,8 +36,8 @@ dnl An alternative would be to explicitly test for 'intmax_t'.
 
 AC_DEFUN([gt_AC_TYPE_INTMAX_T],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
     [AC_TRY_COMPILE([
 #include <stddef.h>
@@ -53,7 +53,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T],
     AC_DEFINE(HAVE_INTMAX_T, 1,
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
   else
-    AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+    AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
     test $ac_cv_type_long_long = yes \
       && ac_type='long long' \
       || ac_type='long'
diff --git a/m4/inttostr.m4 b/m4/inttostr.m4
index c1144fe5a2..43ad5f663c 100644
--- a/m4/inttostr.m4
+++ b/m4/inttostr.m4
@@ -1,4 +1,4 @@
-# inttostr.m4 serial 1
+# inttostr.m4 serial 2
 dnl Copyright (C) 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -16,8 +16,8 @@ AC_DEFUN([gl_INTTOSTR],
 
 # Prerequisites of lib/inttostr.h.
 AC_DEFUN([gl_PREREQ_INTTOSTR], [
-  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
   AC_REQUIRE([AC_TYPE_OFF_T])
   :
 ])
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index ab370ffe00..e19dd36fec 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,5 +1,5 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+# inttypes.m4 serial 2
+dnl Copyright (C) 1997-2002, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index f342eba39a..41dd1ad1c6 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -11,7 +11,7 @@ dnl From Paul Eggert.
 # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
 [
   AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 7716e64117..f93213ae7b 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -2,7 +2,7 @@
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
-AC_DEFUN([jm_MACROS],
+AC_DEFUN([gl_MACROS],
 [
   AC_PREREQ(2.58)
 
@@ -19,34 +19,34 @@ AC_DEFUN([jm_MACROS],
   dnl This macro actually runs replacement code.  See isc-posix.m4.
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
-  jm_CHECK_ALL_TYPES
+  gl_CHECK_ALL_TYPES
 
   AC_REQUIRE([UTILS_HOST_OS])
-  AC_REQUIRE([jm_ASSERT])
-  AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
-  AC_REQUIRE([jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])
-  AC_REQUIRE([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO])
-  AC_REQUIRE([jm_CHECK_DECLS])
+  AC_REQUIRE([gl_ASSERT])
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
+  AC_REQUIRE([gl_CHECK_DECLS])
 
-  AC_REQUIRE([jm_PREREQ])
+  AC_REQUIRE([gl_PREREQ])
 
   AC_REQUIRE([UTILS_FUNC_DIRFD])
   AC_REQUIRE([AC_FUNC_ACL])
-  AC_REQUIRE([jm_FUNC_LCHOWN])
+  AC_REQUIRE([gl_FUNC_LCHOWN])
   AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY])
-  AC_REQUIRE([jm_FUNC_CHOWN])
+  AC_REQUIRE([gl_FUNC_CHOWN])
   AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_REQUIRE([AC_FUNC_STRERROR_R])
-  AC_REQUIRE([jm_FUNC_GROUP_MEMBER])
-  AC_REQUIRE([jm_AFS])
-  AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK])
-  AC_REQUIRE([jm_FUNC_FPENDING])
+  AC_REQUIRE([gl_FUNC_GROUP_MEMBER])
+  AC_REQUIRE([gl_AFS])
+  AC_REQUIRE([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK])
+  AC_REQUIRE([gl_FUNC_FPENDING])
 
   # This is for od and stat, and any other program that
   # uses the PRI.MAX macros from inttypes.h.
   AC_REQUIRE([gt_INTTYPES_PRI])
 
-  AC_REQUIRE([jm_FUNC_GETGROUPS])
+  AC_REQUIRE([gl_FUNC_GETGROUPS])
 
   AC_REQUIRE([AC_FUNC_FSEEKO])
   AC_REQUIRE([AC_FUNC_ALLOCA])
@@ -54,8 +54,8 @@ AC_DEFUN([jm_MACROS],
   AC_CONFIG_LIBOBJ_DIR([lib])
   AC_FUNC_GETLOADAVG([lib])
 
-  AC_REQUIRE([jm_SYS_PROC_UPTIME])
-  AC_REQUIRE([jm_FUNC_FTRUNCATE])
+  AC_REQUIRE([gl_SYS_PROC_UPTIME])
+  AC_REQUIRE([gl_FUNC_FTRUNCATE])
 
   # raise is used by at least sort and ls.
   AC_REPLACE_FUNCS(raise)
@@ -130,9 +130,9 @@ AC_DEFUN([jm_MACROS],
     ])
 
   AM_LANGINFO_CODESET
-  jm_GLIBC21
+  gl_GLIBC21
   AM_ICONV
-  jm_FUNC_UNLINK_BUSY_TEXT
+  gl_FUNC_UNLINK_BUSY_TEXT
 
   # These tests are for df.
   AC_REQUIRE([gl_FSUSAGE])
@@ -140,7 +140,7 @@ AC_DEFUN([jm_MACROS],
   if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
     DF_PROG='df$(EXEEXT)'
   fi
-  AC_REQUIRE([jm_AC_DOS])
+  AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([AC_FUNC_CANONICALIZE_FILE_NAME])
 
   # If any of these functions don't exist (e.g. DJGPP 2.03),
@@ -154,7 +154,7 @@ AC_DEFUN([jm_MACROS],
 # These tests must be run before any use of AC_CHECK_TYPE,
 # because that macro compiles code that tests e.g., HAVE_UNISTD_H.
 # See the definition of ac_includes_default in `configure'.
-AC_DEFUN([jm_CHECK_ALL_HEADERS],
+AC_DEFUN([gl_CHECK_ALL_HEADERS],
 [
   AC_CHECK_HEADERS( \
     errno.h  \
@@ -198,7 +198,7 @@ AC_DEFUN([jm_CHECK_ALL_HEADERS],
 ])
 
 # This macro must be invoked before any tests that run the compiler.
-AC_DEFUN([jm_CHECK_ALL_TYPES],
+AC_DEFUN([gl_CHECK_ALL_TYPES],
 [
   dnl This test must come as early as possible after the compiler configuration
   dnl tests, because the choice of the file model can (in principle) affect
@@ -217,7 +217,7 @@ AC_DEFUN([jm_CHECK_ALL_TYPES],
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_C_LONG_DOUBLE])
 
-  AC_REQUIRE([jm_CHECK_ALL_HEADERS])
+  AC_REQUIRE([gl_CHECK_ALL_HEADERS])
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_MEMBERS(
@@ -249,8 +249,8 @@ AC_DEFUN([jm_CHECK_ALL_TYPES],
   AC_CHECK_TYPE(major_t, unsigned int)
   AC_CHECK_TYPE(minor_t, unsigned int)
 
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
-  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
 
   AC_REQUIRE([AC_HEADER_MAJOR])
   AC_REQUIRE([AC_HEADER_DIRENT])
diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 0fcb46c754..5bfbdab517 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,6 +1,6 @@
-#serial 6
+#serial 7
 dnl From Jim Meyering and Paul Eggert.
-AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
+AC_DEFUN([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 [AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires termios.h],
 	        jm_cv_sys_tiocgwinsz_needs_termios_h,
@@ -18,7 +18,7 @@ AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
   ])
 ])
 
-AC_DEFUN([jm_WINSIZE_IN_PTEM],
+AC_DEFUN([gl_WINSIZE_IN_PTEM],
   [AC_REQUIRE([AC_SYS_POSIX_TERMIOS])
    AC_CACHE_CHECK([whether use of struct winsize requires sys/ptem.h],
      jm_cv_sys_struct_winsize_needs_sys_ptem_h,
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index a7d929d04b..20ceb0d10c 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -1,7 +1,7 @@
-#serial 4
+#serial 5
 
-AC_DEFUN([jm_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
-[AC_REQUIRE([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
+AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
+[AC_REQUIRE([gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
 	        jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
   [jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index e0875fc34c..b40fe85403 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,9 +1,9 @@
-#serial 3
+#serial 4
 
 dnl From Jim Meyering.
 dnl Provide lchown on systems that lack it.
 
-AC_DEFUN([jm_FUNC_LCHOWN],
+AC_DEFUN([gl_FUNC_LCHOWN],
 [
   AC_REQUIRE([AC_TYPE_UID_T])
   AC_REPLACE_FUNCS(lchown)
diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index 92a3685983..0ce73103f0 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -1,8 +1,8 @@
-#serial 6
+#serial 7
 
 dnl Misc lib-related macros for fileutils, sh-utils, textutils.
 
-AC_DEFUN([jm_LIB_CHECK],
+AC_DEFUN([gl_LIB_CHECK],
 [
 
   # Check for libypsec.a on Dolphin M88K machines.
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index 6064ce74b4..45f189ef1f 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,8 +1,8 @@
-#serial 3
+#serial 4
 dnl Run a program to determine whether whether link(2) follows symlinks.
 dnl Set LINK_FOLLOWS_SYMLINKS accordingly.
 
-AC_DEFUN([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK],
+AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK],
 [dnl
   AC_CACHE_CHECK(
     [whether link(2) dereferences a symlink specified with a trailing slash],
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index d163c4c1a0..6cf304df15 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,4 +1,4 @@
-# localcharset.m4 serial 1
+# localcharset.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -15,5 +15,5 @@ AC_DEFUN([gl_LOCALCHARSET],
 
   dnl Prerequisites of the lib/Makefile.am snippet.
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([jm_GLIBC21])
+  AC_REQUIRE([gl_GLIBC21])
 ])
diff --git a/m4/longlong.m4 b/m4/longlong.m4
index d7d7350b3f..698d2ae7ba 100644
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@@ -1,4 +1,4 @@
-# longlong.m4 serial 4
+# longlong.m4 serial 5
 dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,7 +10,7 @@ dnl From Paul Eggert.
 
 # Define HAVE_LONG_LONG if 'long long' works.
 
-AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
 [
   AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
   [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index c28466bb02..a5fe795e7c 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,4 +1,4 @@
-#serial 14
+#serial 15
 
 dnl From Jim Meyering.
 dnl
@@ -6,8 +6,8 @@ dnl This is not pretty.  I've just taken the autoconf code and wrapped
 dnl it in an AC_DEFUN.
 dnl
 
-# jm_LIST_MOUNTED_FILESYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-AC_DEFUN([jm_LIST_MOUNTED_FILESYSTEMS],
+# gl_LIST_MOUNTED_FILESYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([gl_LIST_MOUNTED_FILESYSTEMS],
   [
 AC_CHECK_FUNCS(listmntent getmntinfo)
 AC_CHECK_HEADERS_ONCE(sys/param.h)
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index f85bd042df..0c6362c50f 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
-#serial 10
+#serial 11
 
 dnl From Jim Meyering.
 dnl Determine whether lstat has the bug that it succeeds when given the
@@ -9,7 +9,7 @@ dnl If it does, then define HAVE_LSTAT_EMPTY_STRING_BUG and arrange to
 dnl compile the wrapper function.
 dnl
 
-AC_DEFUN([jm_FUNC_LSTAT],
+AC_DEFUN([gl_FUNC_LSTAT],
 [
   AC_FUNC_LSTAT
   dnl Note: AC_FUNC_LSTAT does AC_LIBOBJ(lstat).
diff --git a/m4/makepath.m4 b/m4/makepath.m4
index edd2d9bce4..a50512578b 100644
--- a/m4/makepath.m4
+++ b/m4/makepath.m4
@@ -1,4 +1,4 @@
-# makepath.m4 serial 2
+# makepath.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -12,5 +12,5 @@ AC_DEFUN([gl_MAKEPATH],
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_REQUIRE([AC_HEADER_STAT])
-  AC_REQUIRE([jm_AFS])
+  AC_REQUIRE([gl_AFS])
 ])
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index 21e9daabab..6e1b58c707 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 5
+# mbrtowc.m4 serial 6
 dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -8,10 +8,10 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert
 
-dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with
+dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with
 dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere.
 
-AC_DEFUN([jm_FUNC_MBRTOWC],
+AC_DEFUN([gl_FUNC_MBRTOWC],
 [
   AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
     jm_cv_func_mbrtowc,
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 7eefd879d2..f61be107a8 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,4 +1,4 @@
-#serial 10
+#serial 11
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
@@ -8,7 +8,7 @@ AC_DEFUN([gl_MBSWIDTH],
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
   AC_CHECK_FUNCS_ONCE(isascii iswprint mbsinit)
   AC_CHECK_FUNCS(iswcntrl wcwidth)
-  jm_FUNC_MBRTOWC
+  gl_FUNC_MBRTOWC
 
   AC_CACHE_CHECK([whether wcwidth is declared], ac_cv_have_decl_wcwidth,
     [AC_TRY_COMPILE([
diff --git a/m4/memchr.m4 b/m4/memchr.m4
index 60a06c271c..549dd86c8a 100644
--- a/m4/memchr.m4
+++ b/m4/memchr.m4
@@ -1,4 +1,4 @@
-# memchr.m4 serial 2
+# memchr.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,11 +10,11 @@ AC_DEFUN([gl_FUNC_MEMCHR],
 [
   AC_REPLACE_FUNCS(memchr)
   if test $ac_cv_func_memchr = no; then
-    jm_PREREQ_MEMCHR
+    gl_PREREQ_MEMCHR
   fi
 ])
 
 # Prerequisites of lib/memchr.c.
-AC_DEFUN([jm_PREREQ_MEMCHR], [
+AC_DEFUN([gl_PREREQ_MEMCHR], [
   AC_CHECK_HEADERS(bp-sym.h)
 ])
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 90d8bb30f2..708fde5121 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,4 +1,4 @@
-# memcmp.m4 serial 9
+# memcmp.m4 serial 10
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -6,7 +6,7 @@ dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 
-AC_DEFUN([jm_FUNC_MEMCMP],
+AC_DEFUN([gl_FUNC_MEMCMP],
 [
   AC_REQUIRE([AC_FUNC_MEMCMP])
   if test $ac_cv_func_memcmp_working = no; then
diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4
index a729b44fe9..f64fe11f62 100644
--- a/m4/mkdtemp.m4
+++ b/m4/mkdtemp.m4
@@ -1,4 +1,4 @@
-# mkdtemp.m4 serial 2
+# mkdtemp.m4 serial 3
 dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -20,6 +20,6 @@ AC_DEFUN([gl_PREREQ_MKDTEMP],
   AC_REQUIRE([AC_HEADER_STAT])
   AC_CHECK_HEADERS_ONCE(sys/time.h unistd.h)
   AC_CHECK_HEADERS(time.h)
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
   AC_CHECK_FUNCS(gettimeofday)
 ])
diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4
index 3d379fd2bf..5f23f798a0 100644
--- a/m4/mkstemp.m4
+++ b/m4/mkstemp.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 # On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
 # silly limit that it can create no more than 26 files from a given template.
@@ -45,7 +45,7 @@ AC_DEFUN([UTILS_FUNC_MKSTEMP],
     AC_DEFINE(mkstemp, rpl_mkstemp,
       [Define to rpl_mkstemp if the replacement function should be used.])
     gl_PREREQ_MKSTEMP
-    jm_PREREQ_TEMPNAME
+    gl_PREREQ_TEMPNAME
   fi
 ])
 
@@ -55,12 +55,12 @@ AC_DEFUN([gl_PREREQ_MKSTEMP],
 ])
 
 # Prerequisites of lib/tempname.c.
-AC_DEFUN([jm_PREREQ_TEMPNAME],
+AC_DEFUN([gl_PREREQ_TEMPNAME],
 [
   AC_REQUIRE([AC_HEADER_STAT])
   AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
   AC_CHECK_HEADERS(stdint.h)
   AC_CHECK_FUNCS(__secure_getenv gettimeofday)
   AC_CHECK_DECLS_ONCE(getenv)
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
 ])
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index 6a6b38c3fe..14df556772 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,4 +1,4 @@
-# mountlist.m4 serial 2
+# mountlist.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -8,7 +8,7 @@ dnl the same distribution terms as the rest of that program.
 
 AC_DEFUN([gl_MOUNTLIST],
 [
-  jm_LIST_MOUNTED_FILESYSTEMS([gl_cv_list_mounted_fs=yes],
+  gl_LIST_MOUNTED_FILESYSTEMS([gl_cv_list_mounted_fs=yes],
                               [gl_cv_list_mounted_fs=no])
   if test $gl_cv_list_mounted_fs = yes; then
     AC_LIBOBJ(mountlist)
@@ -16,11 +16,11 @@ AC_DEFUN([gl_MOUNTLIST],
   fi
 ])
 
-# Prerequisites of lib/mountlist.c not done by jm_LIST_MOUNTED_FILESYSTEMS.
+# Prerequisites of lib/mountlist.c not done by gl_LIST_MOUNTED_FILESYSTEMS.
 AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA],
 [
-  dnl Note jm_LIST_MOUNTED_FILESYSTEMS checks for mntent.h, not sys/mntent.h.
+  dnl Note gl_LIST_MOUNTED_FILESYSTEMS checks for mntent.h, not sys/mntent.h.
   AC_CHECK_HEADERS_ONCE(fcntl.h unistd.h)
   AC_CHECK_HEADERS(sys/mntent.h)
-  jm_FSTYPENAME
+  gl_FSTYPENAME
 ])
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index fd5fd92fc6..0cf4094434 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,11 +1,11 @@
-#serial 9
+#serial 10
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
-AC_DEFUN([jm_FUNC_NANOSLEEP],
+AC_DEFUN([gl_FUNC_NANOSLEEP],
 [
  nanosleep_save_libs=$LIBS
 
diff --git a/m4/path-concat.m4 b/m4/path-concat.m4
index be0534d015..615d61571e 100644
--- a/m4/path-concat.m4
+++ b/m4/path-concat.m4
@@ -1,4 +1,4 @@
-# path-concat.m4 serial 2
+# path-concat.m4 serial 3
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 AC_DEFUN([gl_PATH_CONCAT],
 [
   dnl Prerequisites of lib/path-concat.c.
-  AC_REQUIRE([jm_AC_DOS])
+  AC_REQUIRE([gl_AC_DOS])
   AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_FUNCS_ONCE(mempcpy)
 ])
diff --git a/m4/perl.m4 b/m4/perl.m4
index d5cda7748e..d9c89cde2b 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,10 +1,10 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
 dnl
 
-AC_DEFUN([jm_PERL],
+AC_DEFUN([gl_PERL],
 [
   dnl FIXME: don't hard-code 5.003
   dnl FIXME: should we cache the result?
diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 4c406d11fc..2529668d25 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,13 +1,12 @@
 #serial 38
 
-dnl We use jm_ for non Autoconf macros.
-m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
+dnl We use gl_ for non Autoconf macros.
 m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 
 # These are the prerequisite macros for files in the lib/
 # directory of the coreutils package.
 
-AC_DEFUN([jm_PREREQ],
+AC_DEFUN([gl_PREREQ],
 [
   # We don't yet use c-stack.c.
   # AC_REQUIRE([gl_C_STACK])
@@ -110,17 +109,17 @@ AC_DEFUN([jm_PREREQ],
   AC_REQUIRE([gl_XSTRTOD])
   AC_REQUIRE([gl_XSTRTOL])
   AC_REQUIRE([gl_YESNO])
-  AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO])
-  AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
-  AC_REQUIRE([jm_FUNC_LSTAT])
+  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
+  AC_REQUIRE([gl_FUNC_GNU_STRFTIME])
+  AC_REQUIRE([gl_FUNC_LSTAT])
   AC_REQUIRE([AC_FUNC_MALLOC])
-  AC_REQUIRE([jm_FUNC_MEMCMP])
-  AC_REQUIRE([jm_FUNC_NANOSLEEP])
-  AC_REQUIRE([jm_FUNC_PUTENV])
+  AC_REQUIRE([gl_FUNC_MEMCMP])
+  AC_REQUIRE([gl_FUNC_NANOSLEEP])
+  AC_REQUIRE([gl_FUNC_PUTENV])
   AC_REQUIRE([AC_FUNC_REALLOC])
-  AC_REQUIRE([jm_FUNC_STAT])
-  AC_REQUIRE([jm_FUNC_UTIME])
-  AC_REQUIRE([jm_XSTRTOIMAX])
-  AC_REQUIRE([jm_XSTRTOUMAX])
+  AC_REQUIRE([gl_FUNC_STAT])
+  AC_REQUIRE([gl_FUNC_UTIME])
+  AC_REQUIRE([gl_XSTRTOIMAX])
+  AC_REQUIRE([gl_XSTRTOUMAX])
   AC_REQUIRE([vb_FUNC_RENAME])
 ])
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 77b9f78745..80abf84f72 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,4 +1,4 @@
-# putenv.m4 serial 7
+# putenv.m4 serial 8
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -11,7 +11,7 @@ dnl
 dnl Check whether putenv ("FOO") removes FOO from the environment.
 dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 
-AC_DEFUN([jm_FUNC_PUTENV],
+AC_DEFUN([gl_FUNC_PUTENV],
 [AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
   [AC_TRY_RUN([
     int
diff --git a/m4/quotearg.m4 b/m4/quotearg.m4
index 2fba109f1c..aa4a3d1473 100644
--- a/m4/quotearg.m4
+++ b/m4/quotearg.m4
@@ -1,4 +1,4 @@
-# quotearg.m4 serial 1
+# quotearg.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -12,5 +12,5 @@ AC_DEFUN([gl_QUOTEARG],
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
   AC_CHECK_FUNCS_ONCE(iswprint mbsinit)
   AC_TYPE_MBSTATE_T
-  jm_FUNC_MBRTOWC
+  gl_FUNC_MBRTOWC
 ])
diff --git a/m4/regex.m4 b/m4/regex.m4
index e04dd4a4fd..696fce1ee4 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,16 +1,16 @@
-#serial 20
+#serial 21
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
 
 AC_DEFUN([gl_REGEX],
 [
-  jm_INCLUDED_REGEX([lib/regex.c])
+  gl_INCLUDED_REGEX([lib/regex.c])
 ])
 
-dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
+dnl Usage: gl_INCLUDED_REGEX([lib/regex.c])
 dnl
-AC_DEFUN([jm_INCLUDED_REGEX],
+AC_DEFUN([gl_INCLUDED_REGEX],
   [
     dnl Even packages that don't use regex.c can use this macro.
     dnl Of course, for them it doesn't do anything.
@@ -93,7 +93,7 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 		    jm_with_regex=$ac_use_included_regex)
 	if test "$jm_with_regex" = yes; then
 	  AC_LIBOBJ(regex)
-	  jm_PREREQ_REGEX
+	  gl_PREREQ_REGEX
 	fi
       ],
     )
@@ -101,7 +101,7 @@ AC_DEFUN([jm_INCLUDED_REGEX],
 )
 
 # Prerequisites of lib/regex.c.
-AC_DEFUN([jm_PREREQ_REGEX],
+AC_DEFUN([gl_PREREQ_REGEX],
 [
   dnl FIXME: Maybe provide a btowc replacement someday: Solaris 2.5.1 lacks it.
   dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
diff --git a/m4/stat.m4 b/m4/stat.m4
index bdfee5cb3f..01c682a497 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 dnl From Jim Meyering.
 dnl Determine whether stat has the bug that it succeeds when given the
@@ -9,7 +9,7 @@ dnl If it does, then define HAVE_STAT_EMPTY_STRING_BUG and arrange to
 dnl compile the wrapper function.
 dnl
 
-AC_DEFUN([jm_FUNC_STAT],
+AC_DEFUN([gl_FUNC_STAT],
 [
   AC_FUNC_STAT
   dnl Note: AC_FUNC_STAT does AC_LIBOBJ(stat).
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 32ba7ae77b..e48e210a04 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,5 +1,5 @@
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+# stdint_h.m4 serial 4
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -11,7 +11,7 @@ dnl From Paul Eggert.
 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
 [
   AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
   [AC_TRY_COMPILE(
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index dfcf320bde..0143a2e915 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,8 +1,8 @@
-#serial 21
+#serial 22
 
 dnl This macro is intended to be used solely in this file.
 dnl These are the prerequisite macros for GNU's strftime.c replacement.
-AC_DEFUN([_jm_STRFTIME_PREREQS],
+AC_DEFUN([_gl_STRFTIME_PREREQS],
 [
  dnl strftime.c uses the underyling system strftime if it exists.
  AC_FUNC_STRFTIME
@@ -22,10 +22,10 @@ AC_DEFUN([_jm_STRFTIME_PREREQS],
 
 dnl From Jim Meyering.
 dnl
-AC_DEFUN([jm_FUNC_GNU_STRFTIME],
+AC_DEFUN([gl_FUNC_GNU_STRFTIME],
 [AC_REQUIRE([AC_HEADER_TIME])dnl
 
- _jm_STRFTIME_PREREQS
+ _gl_STRFTIME_PREREQS
 
  AC_REQUIRE([AC_C_CONST])dnl
  AC_CHECK_HEADERS_ONCE(sys/time.h)
@@ -33,7 +33,7 @@ AC_DEFUN([jm_FUNC_GNU_STRFTIME],
    [Define to the name of the strftime replacement function.])
 ])
 
-AC_DEFUN([jm_FUNC_STRFTIME],
+AC_DEFUN([gl_FUNC_STRFTIME],
 [
-  _jm_STRFTIME_PREREQS
+  _gl_STRFTIME_PREREQS
 ])
diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4
index 2cc1776d72..17eaed1101 100644
--- a/m4/strtoimax.m4
+++ b/m4/strtoimax.m4
@@ -1,4 +1,4 @@
-# strtoimax.m4 serial 3
+# strtoimax.m4 serial 4
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX],
 
 # Prerequisites of lib/strtoimax.c.
 AC_DEFUN([gl_PREREQ_STRTOIMAX], [
-  jm_AC_TYPE_INTMAX_T
+  gl_AC_TYPE_INTMAX_T
   AC_CHECK_DECLS(strtoll)
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
 ])
diff --git a/m4/strtoll.m4 b/m4/strtoll.m4
index 73e7251e9a..6d570cc3e3 100644
--- a/m4/strtoll.m4
+++ b/m4/strtoll.m4
@@ -1,4 +1,4 @@
-# strtoll.m4 serial 1
+# strtoll.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRTOLL],
 [
   dnl We don't need (and can't compile) the replacement strtoll
   dnl unless the type 'long long' exists.
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
   if test "$ac_cv_type_long_long" = yes; then
     AC_REPLACE_FUNCS(strtoll)
     if test $ac_cv_func_strtoll = no; then
diff --git a/m4/strtoull.m4 b/m4/strtoull.m4
index 68035c47f3..49c9bbe7d3 100644
--- a/m4/strtoull.m4
+++ b/m4/strtoull.m4
@@ -1,4 +1,4 @@
-# strtoull.m4 serial 1
+# strtoull.m4 serial 2
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRTOULL],
 [
   dnl We don't need (and can't compile) the replacement strtoull
   dnl unless the type 'unsigned long long' exists.
-  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
   if test "$ac_cv_type_unsigned_long_long" = yes; then
     AC_REPLACE_FUNCS(strtoull)
     if test $ac_cv_func_strtoull = no; then
diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4
index 00106585b2..1d5484454f 100644
--- a/m4/strtoumax.m4
+++ b/m4/strtoumax.m4
@@ -1,4 +1,4 @@
-# strtoumax.m4 serial 3
+# strtoumax.m4 serial 4
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_STRTOUMAX],
 
 # Prerequisites of lib/strtoumax.c.
 AC_DEFUN([gl_PREREQ_STRTOUMAX], [
-  jm_AC_TYPE_UINTMAX_T
+  gl_AC_TYPE_UINTMAX_T
   AC_CHECK_DECLS(strtoull)
-  AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
 ])
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 5ca16d48dc..5a346112e8 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 dnl From Jim Meyering
 
@@ -7,7 +7,7 @@ AC_DEFUN([gl_TIMESPEC],
   dnl Prerequisites of lib/timespec.h.
   AC_REQUIRE([AC_HEADER_TIME])
   AC_CHECK_HEADERS_ONCE(sys/time.h)
-  jm_CHECK_TYPE_STRUCT_TIMESPEC
+  gl_CHECK_TYPE_STRUCT_TIMESPEC
   AC_STRUCT_ST_MTIM_NSEC
 
   dnl Persuade glibc <time.h> to declare nanosleep().
@@ -19,7 +19,7 @@ AC_DEFUN([gl_TIMESPEC],
 dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
 dnl in time.h or sys/time.h.
 
-AC_DEFUN([jm_CHECK_TYPE_STRUCT_TIMESPEC],
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
 [
   dnl Persuade pedantic Solaris to declare struct timespec.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index b5f28d4404..41e0edf809 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,5 +1,5 @@
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+# uintmax_t.m4 serial 8
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -13,12 +13,12 @@ AC_PREREQ(2.13)
 # Define uintmax_t to 'unsigned long' or 'unsigned long long'
 # if it is not already defined in <stdint.h> or <inttypes.h>.
 
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
 [
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
+    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
     test $ac_cv_type_unsigned_long_long = yes \
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index 1da8b809e9..3c7c5f03d7 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -1,4 +1,4 @@
-# ulonglong.m4 serial 3
+# ulonglong.m4 serial 4
 dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,7 +10,7 @@ dnl From Paul Eggert.
 
 # Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
 
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
 [
   AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
   [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index 79152e9d53..2f5f27347e 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -1,10 +1,10 @@
-#serial 6
+#serial 7
 
 dnl From J. David Anglin.
 
 dnl HPUX and other systems can't unlink shared text that is being executed.
 
-AC_DEFUN([jm_FUNC_UNLINK_BUSY_TEXT],
+AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT],
 [dnl
   AC_CACHE_CHECK([whether a running program can be unlinked],
     jm_cv_func_unlink_busy_text,
diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4
index f8e98f1d12..cd1c5f4ef7 100644
--- a/m4/unlocked-io.m4
+++ b/m4/unlocked-io.m4
@@ -1,4 +1,4 @@
-#serial 8 -*- autoconf -*-
+#serial 9
 
 dnl From Jim Meyering.
 dnl
@@ -8,7 +8,7 @@ dnl (because some of them were declared in Solaris 2.5.1 but were removed
 dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run
 dnl on Solaris 2.6).
 
-AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
+AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
 [
   dnl Persuade glibc and Solaris <stdio.h> to declare
   dnl fgets_unlocked(), fputs_unlocked() etc.
diff --git a/m4/uptime.m4 b/m4/uptime.m4
index c616eaa85d..53323bfe25 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -1,8 +1,8 @@
-#serial 5
+#serial 6
 
 AC_PREREQ(2.13)
 
-AC_DEFUN([jm_SYS_PROC_UPTIME],
+AC_DEFUN([gl_SYS_PROC_UPTIME],
 [ dnl Require AC_PROG_CC to see if we're cross compiling.
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for /proc/uptime], jm_cv_have_proc_uptime,
diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4
index 21724aafb5..cf1881537f 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering
 
@@ -6,7 +6,7 @@ dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared --
 dnl usually in <utime.h>.
 dnl Some systems have utime.h but don't declare the struct anywhere.
 
-AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
+AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF],
 [
   AC_CHECK_HEADERS_ONCE(sys/time.h utime.h)
   AC_REQUIRE([AC_HEADER_TIME])
diff --git a/m4/utime.m4 b/m4/utime.m4
index e3a159fafa..6762a50db8 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,11 +1,11 @@
-#serial 5
+#serial 6
 
 dnl From Jim Meyering
 dnl Replace the utime function on systems that need it.
 
 dnl FIXME
 
-AC_DEFUN([jm_FUNC_UTIME],
+AC_DEFUN([gl_FUNC_UTIME],
 [
   AC_REQUIRE([AC_FUNC_UTIME_NULL])
   if test $ac_cv_func_utime_null = no; then
@@ -20,6 +20,6 @@ AC_DEFUN([jm_FUNC_UTIME],
 AC_DEFUN([gl_PREREQ_UTIME],
 [
   AC_CHECK_HEADERS_ONCE(utime.h)
-  AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
-  jm_FUNC_UTIMES_NULL
+  AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
+  gl_FUNC_UTIMES_NULL
 ])
diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4
index f7e7842c5a..76512db6c5 100644
--- a/m4/utimes-null.m4
+++ b/m4/utimes-null.m4
@@ -1,9 +1,9 @@
-#serial 4
+#serial 5
 
 dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL,
 dnl then do case-insensitive s/utime/utimes/.
 
-AC_DEFUN([jm_FUNC_UTIMES_NULL],
+AC_DEFUN([gl_FUNC_UTIMES_NULL],
 [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null,
 [rm -f conftest.data; > conftest.data
 AC_TRY_RUN([
diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4
index d309f888ca..172c320e7b 100644
--- a/m4/vasnprintf.m4
+++ b/m4/vasnprintf.m4
@@ -1,4 +1,4 @@
-# vasnprintf.m4 serial 3
+# vasnprintf.m4 serial 4
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_VASNPRINTF],
 AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 [
   AC_REQUIRE([bh_C_SIGNED])
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
@@ -33,7 +33,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 # Prequisites of lib/printf-parse.h, lib/printf-parse.c.
 AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 [
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
@@ -46,7 +46,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 AC_DEFUN([gl_PREREQ_VASNPRINTF],
 [
   AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])
   AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
diff --git a/m4/xstrtoimax.m4 b/m4/xstrtoimax.m4
index 38b4c561b3..065912583b 100644
--- a/m4/xstrtoimax.m4
+++ b/m4/xstrtoimax.m4
@@ -1,9 +1,9 @@
-#serial 3
+#serial 4
 dnl Cloned from xstrtoumax.m4.  Keep these files in sync.
 
-AC_DEFUN([jm_XSTRTOIMAX],
+AC_DEFUN([gl_XSTRTOIMAX],
 [
   dnl Prerequisites of lib/xstrtoimax.c.
-  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
   AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])
diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4
index a21ab2b05a..a18b51ff7d 100644
--- a/m4/xstrtol.m4
+++ b/m4/xstrtol.m4
@@ -1,4 +1,4 @@
-# xstrtol.m4 serial 3
+# xstrtol.m4 serial 4
 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -15,8 +15,8 @@ AC_DEFUN([gl_XSTRTOL],
 # Prerequisites of lib/xstrtol.h.
 AC_DEFUN([gl_PREREQ_XSTRTOL_H],
 [
-  AC_REQUIRE([jm_AC_TYPE_INTMAX_T])
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_INTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
 ])
 
 # Prerequisites of lib/xstrtol.c.
diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index 4f41061f1a..a0fbcc36a9 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,9 +1,9 @@
-#serial 5
+#serial 6
 dnl Cloned from xstrtoimax.m4.  Keep these files in sync.
 
-AC_DEFUN([jm_XSTRTOUMAX],
+AC_DEFUN([gl_XSTRTOUMAX],
 [
   dnl Prerequisites of lib/xstrtoumax.c.
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
   AC_REQUIRE([gl_PREREQ_XSTRTOL])
 ])
diff --git a/modules/assert b/modules/assert
index 72147225df..f8c5bda259 100644
--- a/modules/assert
+++ b/modules/assert
@@ -7,7 +7,7 @@ m4/assert.m4
 Depends-on:
 
 configure.ac:
-jm_ASSERT
+gl_ASSERT
 
 Makefile.am:
 
diff --git a/modules/chown b/modules/chown
index de86204aea..ab05ad403b 100644
--- a/modules/chown
+++ b/modules/chown
@@ -8,7 +8,7 @@ m4/chown.m4
 Depends-on:
 
 configure.ac:
-jm_FUNC_CHOWN
+gl_FUNC_CHOWN
 
 Makefile.am:
 
diff --git a/modules/fpending b/modules/fpending
index 29802094ca..5c2cc119af 100644
--- a/modules/fpending
+++ b/modules/fpending
@@ -9,7 +9,7 @@ m4/fpending.m4
 Depends-on:
 
 configure.ac:
-jm_FUNC_FPENDING
+gl_FUNC_FPENDING
 
 Makefile.am:
 lib_SOURCES += __fpending.h
diff --git a/modules/ftruncate b/modules/ftruncate
index 906ae82474..0b383cdb76 100644
--- a/modules/ftruncate
+++ b/modules/ftruncate
@@ -8,7 +8,7 @@ m4/ftruncate.m4
 Depends-on:
 
 configure.ac:
-jm_FUNC_FTRUNCATE
+gl_FUNC_FTRUNCATE
 
 Makefile.am:
 
diff --git a/modules/getgroups b/modules/getgroups
index 219b454ddc..5e26cc4b10 100644
--- a/modules/getgroups
+++ b/modules/getgroups
@@ -9,7 +9,7 @@ Depends-on:
 xalloc
 
 configure.ac:
-jm_FUNC_GETGROUPS
+gl_FUNC_GETGROUPS
 
 Makefile.am:
 
diff --git a/modules/group-member b/modules/group-member
index 8f8284a251..0dcb8f20bd 100644
--- a/modules/group-member
+++ b/modules/group-member
@@ -11,7 +11,7 @@ xalloc
 stdbool
 
 configure.ac:
-jm_FUNC_GROUP_MEMBER
+gl_FUNC_GROUP_MEMBER
 
 Makefile.am:
 lib_SOURCES += group-member.h
diff --git a/modules/lchown b/modules/lchown
index 7c752d72a0..438bc8c534 100644
--- a/modules/lchown
+++ b/modules/lchown
@@ -10,7 +10,7 @@ Depends-on:
 chown
 
 configure.ac:
-jm_FUNC_LCHOWN
+gl_FUNC_LCHOWN
 
 Makefile.am:
 lib_SOURCES += lchown.h
diff --git a/modules/lstat b/modules/lstat
index 3571e77091..763f16ee3d 100644
--- a/modules/lstat
+++ b/modules/lstat
@@ -10,7 +10,7 @@ stat
 xalloc
 
 configure.ac:
-jm_FUNC_LSTAT
+gl_FUNC_LSTAT
 
 Makefile.am:
 
diff --git a/modules/memcmp b/modules/memcmp
index 303c9b8ee8..d9d4afe4b1 100644
--- a/modules/memcmp
+++ b/modules/memcmp
@@ -8,7 +8,7 @@ m4/memcmp.m4
 Depends-on:
 
 configure.ac:
-jm_FUNC_MEMCMP
+gl_FUNC_MEMCMP
 
 Makefile.am:
 
diff --git a/modules/nanosleep b/modules/nanosleep
index e0d5e038a8..e21a4412a6 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -9,7 +9,7 @@ Depends-on:
 timespec
 
 configure.ac:
-jm_FUNC_NANOSLEEP
+gl_FUNC_NANOSLEEP
 
 Makefile.am:
 
diff --git a/modules/putenv b/modules/putenv
index 3e38deec82..48c86ab201 100644
--- a/modules/putenv
+++ b/modules/putenv
@@ -8,7 +8,7 @@ m4/putenv.m4
 Depends-on:
 
 configure.ac:
-jm_FUNC_PUTENV
+gl_FUNC_PUTENV
 
 Makefile.am:
 
diff --git a/modules/stat b/modules/stat
index 83d2aa23d0..d8d15081f6 100644
--- a/modules/stat
+++ b/modules/stat
@@ -8,7 +8,7 @@ m4/stat.m4
 Depends-on:
 
 configure.ac:
-jm_FUNC_STAT
+gl_FUNC_STAT
 
 Makefile.am:
 
diff --git a/modules/strftime b/modules/strftime
index fe1b391d58..624b66b8f3 100644
--- a/modules/strftime
+++ b/modules/strftime
@@ -12,7 +12,7 @@ time_r
 tzset
 
 configure.ac:
-jm_FUNC_GNU_STRFTIME
+gl_FUNC_GNU_STRFTIME
 
 Makefile.am:
 lib_SOURCES += strftime.c
diff --git a/modules/unlocked-io b/modules/unlocked-io
index ce29ac4c0a..94e1628847 100644
--- a/modules/unlocked-io
+++ b/modules/unlocked-io
@@ -9,7 +9,7 @@ Depends-on:
 extensions
 
 configure.ac:
-jm_FUNC_GLIBC_UNLOCKED_IO
+gl_FUNC_GLIBC_UNLOCKED_IO
 
 Makefile.am:
 lib_SOURCES += unlocked-io.h
diff --git a/modules/utime b/modules/utime
index a0d1ae3a47..0a16822cbf 100644
--- a/modules/utime
+++ b/modules/utime
@@ -13,7 +13,7 @@ safe-read
 full-write
 
 configure.ac:
-jm_FUNC_UTIME
+gl_FUNC_UTIME
 
 Makefile.am:
 
diff --git a/modules/xstrtoimax b/modules/xstrtoimax
index e20af9ed24..e4169d921f 100644
--- a/modules/xstrtoimax
+++ b/modules/xstrtoimax
@@ -11,7 +11,7 @@ xstrtol
 strtoimax
 
 configure.ac:
-jm_XSTRTOIMAX
+gl_XSTRTOIMAX
 
 Makefile.am:
 lib_SOURCES += xstrtoimax.c
diff --git a/modules/xstrtoumax b/modules/xstrtoumax
index 5ef377c2c9..d0f89fa08a 100644
--- a/modules/xstrtoumax
+++ b/modules/xstrtoumax
@@ -10,7 +10,7 @@ xstrtol
 strtoumax
 
 configure.ac:
-jm_XSTRTOUMAX
+gl_XSTRTOUMAX
 
 Makefile.am:
 lib_SOURCES += xstrtoumax.c