Quote the first argument in each use of AC_DEFUN.

55 files changed, 127 insertions, 126 deletions

diff --git a/m4/afs.m4 b/m4/afs.m4
index 13f3bc96d5..bbc4744d07 100644
--- a/m4/afs.m4
+++ b/m4/afs.m4
@@ -1,6 +1,6 @@
-#serial 3
+#serial 4
 
-AC_DEFUN(jm_AFS,
+AC_DEFUN([jm_AFS],
   AC_MSG_CHECKING(for AFS)
   if test -d /afs; then
     AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
diff --git a/m4/assert.m4 b/m4/assert.m4
index c7348e4d20..8ab60b1bdf 100644
--- a/m4/assert.m4
+++ b/m4/assert.m4
@@ -1,7 +1,7 @@
-#serial 2
+#serial 3
 dnl based on code from Eleftherios Gkioulekas
 
-AC_DEFUN(jm_ASSERT,
+AC_DEFUN([jm_ASSERT],
 [
   AC_MSG_CHECKING(whether to enable assertions)
   AC_ARG_ENABLE(assert,
diff --git a/m4/bison.m4 b/m4/bison.m4
index 452bd93a71..228ae4c5a6 100644
--- a/m4/bison.m4
+++ b/m4/bison.m4
@@ -1,6 +1,6 @@
-#serial 1
+#serial 2
 
-AC_DEFUN(jm_BISON,
+AC_DEFUN([jm_BISON],
 [
   # getdate.y works with bison only.
   : ${YACC='bison -y'}
diff --git a/m4/check-decl.m4 b/m4/check-decl.m4
index b282bdebc7..b374705a02 100644
--- a/m4/check-decl.m4
+++ b/m4/check-decl.m4
@@ -1,9 +1,9 @@
-#serial 17
+#serial 18
 
 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([jm_CHECK_DECLS],
 [
   AC_REQUIRE([_jm_DECL_HEADERS])
   AC_REQUIRE([AC_HEADER_TIME])
@@ -77,7 +77,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([_jm_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 49e2ebfada..334f1b779e 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,11 +1,11 @@
-#serial 6
+#serial 7
 
 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([jm_FUNC_CHOWN],
 [AC_REQUIRE([AC_TYPE_UID_T])dnl
  test -z "$ac_cv_header_unistd_h" \
    && AC_CHECK_HEADERS(unistd.h)
diff --git a/m4/d-ino.m4 b/m4/d-ino.m4
index 92d76591e9..6ca60dc5e9 100644
--- a/m4/d-ino.m4
+++ b/m4/d-ino.m4
@@ -1,11 +1,11 @@
-#serial 3
+#serial 4
 
 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([jm_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 3ab69b4442..ef6b729bfc 100644
--- a/m4/d-type.m4
+++ b/m4/d-type.m4
@@ -1,11 +1,11 @@
-#serial 2
+#serial 4
 
 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([jm_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/dos.m4 b/m4/dos.m4
index cc19185c29..868626e7e5 100644
--- a/m4/dos.m4
+++ b/m4/dos.m4
@@ -1,11 +1,11 @@
-# serial 4
+#serial 5
 
 # 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([jm_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 91abae39de..3d9b2b7b67 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,10 +1,10 @@
-#serial 2
+#serial 3
 
 dnl FIXME: put these prerequisite-only *.m4 files in a separate
 dnl directory -- otherwise, they'll conflict with existing files.
 
 dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+AC_DEFUN([jm_PREREQ_ERROR],
 [
   AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
   AC_FUNC_STRERROR_R
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index d4a839379f..2a158136eb 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -1,10 +1,10 @@
-#serial 3
+#serial 4
 
 dnl Determine whether to add fnmatch.o to LIBOBJS and to
 dnl define fnmatch to rpl_fnmatch.
 dnl
 
-AC_DEFUN(jm_FUNC_FNMATCH,
+AC_DEFUN([jm_FUNC_FNMATCH],
 [
   AC_REQUIRE([AM_GLIBC])
   AC_FUNC_FNMATCH
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index a6e4338dda..c72b7cc4a7 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 2
 
 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([jm_FUNC_FPENDING],
 [
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
diff --git a/m4/fstypename.m4 b/m4/fstypename.m4
index 70abc12b38..fdf49481bd 100644
--- a/m4/fstypename.m4
+++ b/m4/fstypename.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 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([jm_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 fe0b8dc027..451a5cc8cc 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
 
 # From fileutils/configure.in
 
@@ -8,7 +8,7 @@
 #
 # jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
 
-AC_DEFUN(jm_FILE_SYSTEM_USAGE,
+AC_DEFUN([jm_FILE_SYSTEM_USAGE],
 [
 
 echo "checking how to get filesystem space usage..."
diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index d158e25b82..0397a000c2 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,8 +1,8 @@
-#serial 3
+#serial 4
 
 # See if we need to emulate a missing ftruncate function using fcntl or chsize.
 
-AC_DEFUN(jm_FUNC_FTRUNCATE,
+AC_DEFUN([jm_FUNC_FTRUNCATE],
 [
   AC_CHECK_FUNCS(ftruncate, , [ftruncate_missing=yes])
 
diff --git a/m4/getgroups.m4 b/m4/getgroups.m4
index 3f3902353b..8f3b6c9e52 100644
--- a/m4/getgroups.m4
+++ b/m4/getgroups.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 dnl From Jim Meyering.
 dnl
@@ -7,7 +7,7 @@ dnl  jm_FUNC_GETGROUPS
 dnl  test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
 dnl
 
-AC_DEFUN(jm_FUNC_GETGROUPS,
+AC_DEFUN([jm_FUNC_GETGROUPS],
 [AC_REQUIRE([AC_TYPE_GETGROUPS])dnl
  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
  AC_CHECK_FUNCS(getgroups)
diff --git a/m4/glibc.m4 b/m4/glibc.m4
index a5314c1820..687405768d 100644
--- a/m4/glibc.m4
+++ b/m4/glibc.m4
@@ -1,10 +1,10 @@
-#serial 2
+#serial 3
 
 dnl From Gordon Matzigkeit.
 dnl Test for the GNU C Library.
 dnl FIXME: this should migrate into libit.
 
-AC_DEFUN(AM_GLIBC,
+AC_DEFUN([AM_GLIBC],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library,
       ac_cv_gnu_library,
diff --git a/m4/gnu-source.m4 b/m4/gnu-source.m4
index 4eab53448c..d2f490b0d6 100644
--- a/m4/gnu-source.m4
+++ b/m4/gnu-source.m4
@@ -1,11 +1,11 @@
-#serial 2
+#serial 3
 # Make sure _GNU_SOURCE is defined where necessary: as early as possible
 # for configure-time tests, as well as for every source file that includes
 # config.h.
 
 # From Jim Meyering.
 
-AC_DEFUN(AC__GNU_SOURCE,
+AC_DEFUN([AC__GNU_SOURCE],
 [
   # Make sure that _GNU_SOURCE is defined for all subsequent
   # configure-time compile tests.
diff --git a/m4/group-member.m4 b/m4/group-member.m4
index 69498e4670..2a8f0427e6 100644
--- a/m4/group-member.m4
+++ b/m4/group-member.m4
@@ -1,8 +1,8 @@
-#serial 2
+#serial 3
 
 dnl Written by Jim Meyering
 
-AC_DEFUN(jm_FUNC_GROUP_MEMBER,
+AC_DEFUN([jm_FUNC_GROUP_MEMBER],
   [
     dnl Do this replacement check manually because I want the hyphen
     dnl (not the underscore) in the filename.
diff --git a/m4/jm-glibc-io.m4 b/m4/jm-glibc-io.m4
index 3d32b9ff5a..06ad89c77e 100644
--- a/m4/jm-glibc-io.m4
+++ b/m4/jm-glibc-io.m4
@@ -8,7 +8,7 @@ dnl See if the glibc *_unlocked I/O macros are available.
 dnl Use only those *_unlocked macros that are declared.
 dnl
 
-AC_DEFUN(jm_FUNC_GLIBC_UNLOCKED_IO,
+AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
   [
     # Kludge (not executed) to make autoheader do the right thing.
     if test a = b; then
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 82a82c5b11..17a0e9a5dc 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([jm_MACROS],
 [
   AC_PREREQ(2.52)
 
@@ -113,6 +113,7 @@ AC_DEFUN(jm_MACROS,
     AC_CHECK_FUNCS(clock_gettime)
   LIBS=$fetish_saved_libs
   AC_CHECK_FUNCS(gettimeofday)
+  AC_FUNC_GETTIMEOFDAY_CLOBBER
 
   AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
   AC_REQUIRE([jm_FUNC_UTIME])
@@ -197,7 +198,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([jm_CHECK_ALL_HEADERS],
 [
   AC_CHECK_HEADERS( \
     errno.h  \
@@ -241,7 +242,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([jm_CHECK_ALL_TYPES],
 [
   # FIXME: I shouldn't have to require this macro here.  Rather, it should
   # be required by any autoconf macro that performs a compile-time test or
diff --git a/m4/jm-mktime.m4 b/m4/jm-mktime.m4
index 5bb7357627..63e7cef848 100644
--- a/m4/jm-mktime.m4
+++ b/m4/jm-mktime.m4
@@ -1,9 +1,9 @@
-#serial 7
+#serial 8
 
 dnl From Jim Meyering.
 dnl A wrapper around AC_FUNC_MKTIME.
 
-AC_DEFUN(jm_FUNC_MKTIME,
+AC_DEFUN([jm_FUNC_MKTIME],
 [AC_REQUIRE([AC_FUNC_MKTIME])dnl
 
  dnl mktime.c uses localtime_r if it exists.  Check for it.
diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4
index 80c7bedfe7..0c43ac32e7 100644
--- a/m4/jm-winsz1.m4
+++ b/m4/jm-winsz1.m4
@@ -1,6 +1,6 @@
 dnl From Jim Meyering.
-#serial 3
-AC_DEFUN(jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H,
+#serial 4
+AC_DEFUN([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H],
 [AC_REQUIRE([AM_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([jm_WINSIZE_IN_PTEM],
   [AC_CHECK_HEADER([sys/ptem.h],
 		   AC_DEFINE(WINSIZE_IN_PTEM, 1,
       [Define if your system defines `struct winsize' in sys/ptem.h.]))
diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4
index f3c4709246..a7d929d04b 100644
--- a/m4/jm-winsz2.m4
+++ b/m4/jm-winsz2.m4
@@ -1,6 +1,6 @@
-#serial 3
+#serial 4
 
-AC_DEFUN(jm_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
+AC_DEFUN([jm_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
 [AC_REQUIRE([jm_HEADER_TIOCGWINSZ_IN_TERMIOS_H])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
 	        jm_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
diff --git a/m4/lchown.m4 b/m4/lchown.m4
index 68398ed7a0..9e4fb6fc59 100644
--- a/m4/lchown.m4
+++ b/m4/lchown.m4
@@ -1,9 +1,9 @@
-#serial 1
+#serial 2
 
 dnl From Jim Meyering.
 dnl Provide lchown on systems that lack it.
 
-AC_DEFUN(jm_FUNC_LCHOWN,
+AC_DEFUN([jm_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 0e4cc3a47a..15ffe542d6 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -1,8 +1,8 @@
-#serial 4
+#serial 5
 
 dnl Misc lib-related macros for fileutils, sh-utils, textutils.
 
-AC_DEFUN(jm_LIB_CHECK,
+AC_DEFUN([jm_LIB_CHECK],
 [
 
   # Check for libypsec.a on Dolphin M88K machines.
diff --git a/m4/libintl.m4 b/m4/libintl.m4
index 87ecce46df..344713eb30 100644
--- a/m4/libintl.m4
+++ b/m4/libintl.m4
@@ -6,11 +6,11 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 110
+#serial 111
 
 AC_PREREQ(2.13)               dnl Minimum Autoconf version required.
 
-AC_DEFUN(AM_WITH_NLS,
+AC_DEFUN([AM_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -196,7 +196,7 @@ AC_DEFUN(AM_WITH_NLS,
     AC_SUBST(POSUB)
   ])
 
-AC_DEFUN(AM_GNU_GETTEXT,
+AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
diff --git a/m4/link-follow.m4 b/m4/link-follow.m4
index a3b07eb759..6064ce74b4 100644
--- a/m4/link-follow.m4
+++ b/m4/link-follow.m4
@@ -1,8 +1,8 @@
-#serial 2
+#serial 3
 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([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK],
 [dnl
   AC_CACHE_CHECK(
     [whether link(2) dereferences a symlink specified with a trailing slash],
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 6b848177de..541ea66a30 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,4 +1,4 @@
-#serial 10
+#serial 11
 
 dnl From Jim Meyering.
 dnl
@@ -7,7 +7,7 @@ dnl it in an AC_DEFUN.
 dnl
 
 # jm_LIST_MOUNTED_FILESYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-AC_DEFUN(jm_LIST_MOUNTED_FILESYSTEMS,
+AC_DEFUN([jm_LIST_MOUNTED_FILESYSTEMS],
   [
 AC_CHECK_FUNCS(listmntent getmntinfo)
 AC_CHECK_HEADERS(mntent.h)
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 4e0cfefc44..c2e6ca13fa 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 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([jm_FUNC_LSTAT],
 [
  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
  AC_CACHE_CHECK([whether lstat accepts an empty string],
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 25ab6e3124..05c66ad6a2 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,11 +1,11 @@
-#serial 4
+#serial 5
 
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 
-AC_DEFUN(jm_FUNC_MALLOC,
+AC_DEFUN([jm_FUNC_MALLOC],
 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken malloc -- as it might if this test were omitted.
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index fca91a5f86..87743919b9 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,8 +1,8 @@
-#serial 3
+#serial 4
 
 dnl From Paul Eggert
 
-AC_DEFUN(jm_FUNC_MBRTOWC,
+AC_DEFUN([jm_FUNC_MBRTOWC],
 [
   AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
     jm_cv_func_mbrtowc,
diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index a185a7dbcf..ae2bcf1e8e 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,4 +1,4 @@
-# serial 8
+# serial 9
 
 # From Paul Eggert.
 
@@ -10,7 +10,7 @@
 # (at least glibc-2.1.3) because the "_XOPEN_SOURCE 500" definition elicits
 # a syntax error in wchar.h due to the use of undefined __int32_t.
 
-AC_DEFUN(AC_MBSTATE_T,
+AC_DEFUN([AC_MBSTATE_T],
   [
    AC_CHECK_HEADERS(stdlib.h)
 
diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4
index 26f661f649..74ae58193a 100644
--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -1,9 +1,9 @@
-#serial 5
+#serial 6
 
 dnl autoconf tests required for use of mbswidth.c
 dnl From Bruno Haible.
 
-AC_DEFUN(jm_PREREQ_MBSWIDTH,
+AC_DEFUN([jm_PREREQ_MBSWIDTH],
 [
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index a6b6d54e9b..f1d7a88e18 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,6 +1,6 @@
-#serial 6
+#serial 7
 
-AC_DEFUN(jm_FUNC_MEMCMP,
+AC_DEFUN([jm_FUNC_MEMCMP],
 [AC_REQUIRE([AC_FUNC_MEMCMP])dnl
  if test $ac_cv_func_memcmp_working = no; then
    AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp,
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index d3d0ef89f5..2e0b971999 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,11 +1,11 @@
-#serial 7
+#serial 8
 
 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([jm_FUNC_NANOSLEEP],
 [
  nanosleep_save_libs=$LIBS
 
diff --git a/m4/perl.m4 b/m4/perl.m4
index e21fc9dbda..ff8c141402 100644
--- a/m4/perl.m4
+++ b/m4/perl.m4
@@ -1,10 +1,10 @@
-#serial 3
+#serial 4
 
 dnl From Jim Meyering.
 dnl Find a new-enough version of Perl.
 dnl
 
-AC_DEFUN(jm_PERL,
+AC_DEFUN([jm_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 cfa5aad05a..b0142f3438 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,9 +1,9 @@
-#serial 19
+#serial 20
 
 dnl These are the prerequisite macros for files in the lib/
 dnl directories of the fileutils, sh-utils, and textutils packages.
 
-AC_DEFUN(jm_PREREQ,
+AC_DEFUN([jm_PREREQ],
 [
   jm_PREREQ_ADDEXT
   jm_PREREQ_CANON_HOST
@@ -20,7 +20,7 @@ AC_DEFUN(jm_PREREQ,
   jm_PREREQ_TEMPNAME # called by mkstemp
 ])
 
-AC_DEFUN(jm_PREREQ_ADDEXT,
+AC_DEFUN([jm_PREREQ_ADDEXT],
 [
   dnl For addext.c.
   AC_SYS_LONG_FILE_NAMES
@@ -28,7 +28,7 @@ AC_DEFUN(jm_PREREQ_ADDEXT,
   AC_CHECK_HEADERS(limits.h string.h unistd.h)
 ])
 
-AC_DEFUN(jm_PREREQ_CANON_HOST,
+AC_DEFUN([jm_PREREQ_CANON_HOST],
 [
   dnl Add any libraries as early as possible.
   dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
@@ -43,19 +43,19 @@ AC_DEFUN(jm_PREREQ_CANON_HOST,
                    netinet/in.h arpa/inet.h)
 ])
 
-AC_DEFUN(jm_PREREQ_DIRNAME,
+AC_DEFUN([jm_PREREQ_DIRNAME],
 [
   AC_HEADER_STDC
   AC_CHECK_HEADERS(string.h)
 ])
 
-AC_DEFUN(jm_PREREQ_GETPAGESIZE,
+AC_DEFUN([jm_PREREQ_GETPAGESIZE],
 [
   AC_CHECK_FUNCS(getpagesize)
   AC_CHECK_HEADERS(OS.h unistd.h)
 ])
 
-AC_DEFUN(jm_PREREQ_HASH,
+AC_DEFUN([jm_PREREQ_HASH],
 [
   AC_CHECK_HEADERS(stdlib.h stdbool.h)
   AC_REQUIRE([jm_CHECK_DECLS])
@@ -63,7 +63,7 @@ AC_DEFUN(jm_PREREQ_HASH,
 
 # If you use human.c, you need the following files:
 # uintmax_t.m4 inttypes_h.m4 ulonglong.m4
-AC_DEFUN(jm_PREREQ_HUMAN,
+AC_DEFUN([jm_PREREQ_HUMAN],
 [
   AC_CHECK_HEADERS(limits.h stdlib.h string.h)
   AC_CHECK_DECLS([getenv])
@@ -71,12 +71,12 @@ AC_DEFUN(jm_PREREQ_HUMAN,
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
 ])
 
-AC_DEFUN(jm_PREREQ_MEMCHR,
+AC_DEFUN([jm_PREREQ_MEMCHR],
 [
   AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
 ])
 
-AC_DEFUN(jm_PREREQ_QUOTEARG,
+AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
   AC_CHECK_FUNCS(isascii iswprint)
   jm_FUNC_MBRTOWC
@@ -87,7 +87,7 @@ AC_DEFUN(jm_PREREQ_QUOTEARG,
   AM_C_PROTOTYPES
 ])
 
-AC_DEFUN(jm_PREREQ_READUTMP,
+AC_DEFUN([jm_PREREQ_READUTMP],
 [
   AC_HEADER_STDC
   AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
@@ -115,7 +115,7 @@ $ac_includes_default
   fi
 ])
 
-AC_DEFUN(jm_PREREQ_REGEX,
+AC_DEFUN([jm_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
@@ -126,7 +126,7 @@ AC_DEFUN(jm_PREREQ_REGEX,
   AC_FUNC_ALLOCA
 ])
 
-AC_DEFUN(jm_PREREQ_TEMPNAME,
+AC_DEFUN([jm_PREREQ_TEMPNAME],
 [
   AC_HEADER_STDC
   AC_HEADER_STAT
diff --git a/m4/putenv.m4 b/m4/putenv.m4
index efaf0561f7..eb6ef5f935 100644
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 dnl From Jim Meyering.
 dnl
@@ -6,7 +6,7 @@ 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.
 dnl
 
-AC_DEFUN(jm_FUNC_PUTENV,
+AC_DEFUN([jm_FUNC_PUTENV],
 [AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
   [AC_TRY_RUN([
     int
diff --git a/m4/readdir.m4 b/m4/readdir.m4
index d851b0fe38..6087602c41 100644
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 
 dnl SunOS's readdir is broken in such a way that rm.c has to add extra code
 dnl to test whether a NULL return value really means there are no more files
@@ -12,7 +12,7 @@ dnl Define HAVE_WORKING_READDIR if readdir does *not* have this problem.
 
 dnl Written by Jim Meyering.
 
-AC_DEFUN(jm_FUNC_READDIR,
+AC_DEFUN([jm_FUNC_READDIR],
 [dnl
 AC_REQUIRE([AC_HEADER_DIRENT])
 AC_CHECK_HEADERS(string.h)
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index 9dbc9615ca..ff8314dd4f 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,11 +1,11 @@
-#serial 4
+#serial 5
 
 dnl From Jim Meyering.
 dnl Determine whether realloc works when both arguments are 0.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 
-AC_DEFUN(jm_FUNC_REALLOC,
+AC_DEFUN([jm_FUNC_REALLOC],
 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken realloc -- as it might if this test were omitted.
diff --git a/m4/regex.m4 b/m4/regex.m4
index 0eb69fc74a..0017507edf 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,11 +1,11 @@
-#serial 11
+#serial 12
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
 
 dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
 dnl
-AC_DEFUN(jm_INCLUDED_REGEX,
+AC_DEFUN([jm_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.
diff --git a/m4/rename.m4 b/m4/rename.m4
index ba76240fd1..41359ce0f4 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
 
 dnl From Volker Borchert.
 dnl Determine whether rename works for source paths with a trailing slash.
@@ -8,7 +8,7 @@ dnl If it doesn't, then define RENAME_TRAILING_SLASH_BUG and arrange
 dnl to compile the wrapper function.
 dnl
 
-AC_DEFUN(vb_FUNC_RENAME,
+AC_DEFUN([vb_FUNC_RENAME],
 [
  AC_CACHE_CHECK([whether rename is broken],
   vb_cv_func_rename_trailing_slash_bug,
diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index 1f4f21fba7..cb21d80260 100644
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,11 +1,11 @@
-#serial 2
+#serial 3
 
 # When rmdir fails because the specified directory is not empty, it sets
 # errno to some value, usually ENOTEMPTY.  However, on some AIX systems,
 # ENOTEMPTY is mistakenly defined to be EEXIST.  To work around this, and
 # in general, to avoid depending on the use of any particular symbol, this
 # test runs a test to determine the actual numeric value.
-AC_DEFUN(fetish_FUNC_RMDIR_NOTEMPTY,
+AC_DEFUN([fetish_FUNC_RMDIR_NOTEMPTY],
 [dnl
   AC_CACHE_CHECK([for rmdir-not-empty errno value],
     fetish_cv_func_rmdir_errno_not_empty,
diff --git a/m4/search-libs.m4 b/m4/search-libs.m4
index ce9b468687..41c1c04efa 100644
--- a/m4/search-libs.m4
+++ b/m4/search-libs.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 
 dnl A replacement for autoconf's macro by the same name.  This version
 dnl uses `ac_lib' rather than `i' for the loop variable, but more importantly
@@ -13,7 +13,7 @@ undefine([AC_SEARCH_LIBS])
 #                [OTHER-LIBRARIES])
 # --------------------------------------------------------
 # Search for a library defining FUNC, if it's not already available.
-AC_DEFUN(AC_SEARCH_LIBS,
+AC_DEFUN([AC_SEARCH_LIBS],
 [
   AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
   [
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4
index 625ea94aa3..bd22665a2c 100644
--- a/m4/st_dm_mode.m4
+++ b/m4/st_dm_mode.m4
@@ -1,8 +1,8 @@
-#serial 2
+#serial 3
 
 # Define HAVE_ST_DM_MODE if struct stat has an st_dm_mode member.
 
-AC_DEFUN(AC_STRUCT_ST_DM_MODE,
+AC_DEFUN([AC_STRUCT_ST_DM_MODE],
  [AC_CACHE_CHECK([for st_dm_mode in struct stat], ac_cv_struct_st_dm_mode,
    [AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/stat.h>], [struct stat s; s.st_dm_mode;],
diff --git a/m4/st_mtim.m4 b/m4/st_mtim.m4
index ec58bef31b..e9342cfebf 100644
--- a/m4/st_mtim.m4
+++ b/m4/st_mtim.m4
@@ -1,11 +1,11 @@
-#serial 4
+#serial 5
 
 dnl From Paul Eggert.
 
 # Define ST_MTIM_NSEC to be the nanoseconds member of struct stat's st_mtim,
 # if it exists.
 
-AC_DEFUN(AC_STRUCT_ST_MTIM_NSEC,
+AC_DEFUN([AC_STRUCT_ST_MTIM_NSEC],
  [AC_CACHE_CHECK([for nanoseconds member of struct stat.st_mtim],
    ac_cv_struct_st_mtim_nsec,
    [ac_save_CPPFLAGS="$CPPFLAGS"
diff --git a/m4/stat.m4 b/m4/stat.m4
index b558bb9965..3bc732d6fc 100644
--- a/m4/stat.m4
+++ b/m4/stat.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 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([jm_FUNC_STAT],
 [
  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
  AC_CACHE_CHECK([whether stat accepts an empty string],
diff --git a/m4/strftime.m4 b/m4/strftime.m4
index 1a1423c71d..831faecac5 100644
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,8 +1,8 @@
-#serial 16
+#serial 17
 
 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([_jm_STRFTIME_PREREQS],
 [
  dnl strftime.c uses localtime_r and the underyling system strftime
  dnl if they exist.
@@ -25,7 +25,7 @@ AC_DEFUN(_jm_STRFTIME_PREREQS,
 
 dnl From Jim Meyering.
 dnl
-AC_DEFUN(jm_FUNC_GNU_STRFTIME,
+AC_DEFUN([jm_FUNC_GNU_STRFTIME],
 [AC_REQUIRE([AC_HEADER_TIME])dnl
 
  _jm_STRFTIME_PREREQS
@@ -37,7 +37,7 @@ AC_DEFUN(jm_FUNC_GNU_STRFTIME,
    [Define to the name of the strftime replacement function.])
 ])
 
-AC_DEFUN(jm_FUNC_STRFTIME,
+AC_DEFUN([jm_FUNC_STRFTIME],
 [
   _jm_STRFTIME_PREREQS
 ])
diff --git a/m4/timespec.m4 b/m4/timespec.m4
index 36ea5cac38..4d547cf261 100644
--- a/m4/timespec.m4
+++ b/m4/timespec.m4
@@ -1,11 +1,11 @@
-#serial 4
+#serial 5
 
 dnl From Jim Meyering
 
 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([jm_CHECK_TYPE_STRUCT_TIMESPEC],
 [
   AC_REQUIRE([AC_HEADER_TIME])
   AC_CACHE_CHECK([for struct timespec], fu_cv_sys_struct_timespec,
diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4
index be6a7ddf97..79152e9d53 100644
--- a/m4/unlink-busy.m4
+++ b/m4/unlink-busy.m4
@@ -1,10 +1,10 @@
-#serial 5
+#serial 6
 
 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([jm_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/uptime.m4 b/m4/uptime.m4
index 74fef5e72c..c616eaa85d 100644
--- a/m4/uptime.m4
+++ b/m4/uptime.m4
@@ -1,8 +1,8 @@
-#serial 4
+#serial 5
 
 AC_PREREQ(2.13)
 
-AC_DEFUN(jm_SYS_PROC_UPTIME,
+AC_DEFUN([jm_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 1e36f39e42..7c82f19e0c 100644
--- a/m4/utimbuf.m4
+++ b/m4/utimbuf.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 
 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([jm_CHECK_TYPE_STRUCT_UTIMBUF],
 [
   AC_CHECK_HEADERS(utime.h)
   AC_REQUIRE([AC_HEADER_TIME])
diff --git a/m4/utime.m4 b/m4/utime.m4
index ea3980a99e..34a0d1a1b9 100644
--- a/m4/utime.m4
+++ b/m4/utime.m4
@@ -1,11 +1,11 @@
-#serial 2
+#serial 3
 
 dnl From Jim Meyering
 dnl Replace the utime function on systems that need it.
 
 dnl FIXME
 
-AC_DEFUN(jm_FUNC_UTIME,
+AC_DEFUN([jm_FUNC_UTIME],
 [
   AC_CHECK_HEADERS(utime.h)
   AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
diff --git a/m4/utimes.m4 b/m4/utimes.m4
index c1cdd96e32..0f70ee3cc5 100644
--- a/m4/utimes.m4
+++ b/m4/utimes.m4
@@ -1,9 +1,9 @@
-#serial 3
+#serial 4
 
 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([jm_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/xstrtoumax.m4 b/m4/xstrtoumax.m4
index 523ebe0e3e..d5a58f187d 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -1,8 +1,8 @@
-#serial 3
+#serial 4
 
 # autoconf tests required for use of xstrtoumax.c
 
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
 [
   AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])