* m4/*.m4: quote underquoted definitions

    * m4/codeset.m4: serial AM1 -> serial 1
    * m4/iconv.m4: serial AM2 -> serial 2
    * m4/header.m4: m4_regexp -> m4_bregexp, m4_patsubst -> m4_bpatsubst

* m4/*.m4: quote underquoted definitions
* m4/codeset.m4: serial AM1 -> serial 1
* m4/iconv.m4: serial AM2 -> serial 2
* m4/header.m4: m4_regexp -> m4_bregexp, m4_patsubst -> m4_bpatsubst

17 files changed, 26 insertions, 27 deletions

diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 863c9cfa..f38e524d 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,4 +1,4 @@
-#serial AM1
+#serial 1
 
 dnl From Bruno Haible.
 
diff --git a/m4/decl.m4 b/m4/decl.m4
index 7d20e38b..c503a5de 100644
--- a/m4/decl.m4
+++ b/m4/decl.m4
@@ -1,6 +1,6 @@
 #serial 5
 
-AC_DEFUN(jm_CHECK_DECLARATION,
+AC_DEFUN([jm_CHECK_DECLARATION],
 [
   AC_MSG_CHECKING([whether $1 is declared])
   AC_CACHE_VAL(jm_cv_func_decl_$1,
@@ -25,7 +25,7 @@ char *(*pfn) = (char *(*)) $1
 
 dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
 dnl                       [, ACTION-IF-NOT-DECLARED]])
-AC_DEFUN(jm_CHECK_DECLARATIONS,
+AC_DEFUN([jm_CHECK_DECLARATIONS],
 [
   for jm_func in $2
   do
diff --git a/m4/djgpp.m4 b/m4/djgpp.m4
index 607c8e59..03794523 100644
--- a/m4/djgpp.m4
+++ b/m4/djgpp.m4
@@ -1,6 +1,6 @@
 dnl Check for DJGPP. we use DJ_GPP as the variable
 dnl EXEEXXT
-AC_DEFUN(AC_DJGPP,
+AC_DEFUN([AC_DJGPP],
 [AC_CACHE_CHECK(for DJGPP environment, ac_cv_djgpp,
 [AC_TRY_COMPILE(,[ return __DJGPP__;],
 ac_cv_djgpp=yes, ac_cv_djgpp=no)
diff --git a/m4/dosfile.m4 b/m4/dosfile.m4
index 5616eea4..c9c51029 100644
--- a/m4/dosfile.m4
+++ b/m4/dosfile.m4
@@ -3,7 +3,7 @@
 # Also set the macro HAVE_DOS_FILE_CONTENTS for now,
 # since don't know of a good way to independently check this.
 dnl AC_DOSFILE()
-AC_DEFUN(AC_DOSFILE,
+AC_DEFUN([AC_DOSFILE],
 [
   AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile,
     [if test -d ".\."; then
diff --git a/m4/envsep.m4 b/m4/envsep.m4
index 8a3d2687..7f053dd4 100644
--- a/m4/envsep.m4
+++ b/m4/envsep.m4
@@ -3,7 +3,7 @@
 
 dnl AM_SEP()
 dnl SEP
-AC_DEFUN(AM_SEP,
+AC_DEFUN([AM_SEP],
 [AC_REQUIRE([AC_CYGWIN])
 AC_REQUIRE([AC_MINGW32])
 AC_REQUIRE([AC_DJGPP])
diff --git a/m4/error.m4 b/m4/error.m4
index eb0f776b..cbf00426 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -4,7 +4,7 @@ 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_HEADER_STDC
diff --git a/m4/glibc.m4 b/m4/glibc.m4
index 802b2331..ace0d3dc 100644
--- a/m4/glibc.m4
+++ b/m4/glibc.m4
@@ -2,7 +2,7 @@ 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/header.m4 b/m4/header.m4
index f8e065fe..5f1d7118 100644
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_CONFIG_HEADER],
 	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
 	 dnl prepare to store our destination file list for use in config.status
 	 AC_FOREACH([_AM_File], [$1],
-		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+		    [m4_pushdef([_AM_Dest], m4_bpatsubst(_AM_File, [:.*]))
 		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
 		    dnl and add it to the list of files AC keeps track of, along
 		    dnl with our hook
@@ -56,11 +56,11 @@ done])
 # -----------------
 # Like AS_DIRNAME, only do it during macro expansion
 AC_DEFUN([_AM_DIRNAME],
-       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
-		    m4_if(m4_regexp([$1], [^/.*]), -1,
+       [m4_if(m4_bregexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(m4_bregexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(m4_bregexp([$1], [^/.*]), -1,
 			  [.],
-			  m4_patsubst([$1], [^\(/\).*], [\1])),
-		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+			  m4_bpatsubst([$1], [^\(/\).*], [\1])),
+		    m4_bpatsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      m4_bpatsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
 ]) # _AM_DIRNAME
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 17237344..7cb3889a 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,4 +1,4 @@
-#serial AM2
+#serial 2
 
 dnl From Bruno Haible.
 
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 750639d6..6b046bb1 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -5,7 +5,7 @@ dnl From Paul Eggert.
 # Define HAVE_INTTYPES_H if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
 [
   AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 2f00142d..bc43b607 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -5,7 +5,7 @@ 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/mbstate_t.m4 b/m4/mbstate_t.m4
index a185a7db..b4529271 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -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/realloc.m4 b/m4/realloc.m4
index ff250463..d40a048b 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -5,7 +5,7 @@ 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 56df3186..b313b5e1 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -5,7 +5,7 @@ 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/uintmax_t.m4 b/m4/uintmax_t.m4
index 222beffa..c3e8ecf6 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -2,14 +2,13 @@
 
 dnl From Paul Eggert.
 
-AC_PREREQ(2.13)
 
 # Define uintmax_t to `unsigned long' or `unsigned long long'
 # if <inttypes.h> does not exist.
 
-AC_DEFUN(jm_AC_TYPE_UINTMAX_T,
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
+[AC_PREREQ(2.13)dnl
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])dnl
   if test $jm_ac_cv_header_inttypes_h = no; then
     AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
     test $ac_cv_type_unsigned_long_long = yes \
diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4
index e2fbb552..51fc4181 100644
--- a/m4/ulonglong.m4
+++ b/m4/ulonglong.m4
@@ -2,7 +2,7 @@
 
 dnl From Paul Eggert.
 
-AC_DEFUN(jm_AC_TYPE_UNSIGNED_LONG_LONG,
+AC_DEFUN([jm_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 = 1; int i = 63;],
diff --git a/m4/xstrtoumax.m4 b/m4/xstrtoumax.m4
index f6e31996..9bbcec7e 100644
--- a/m4/xstrtoumax.m4
+++ b/m4/xstrtoumax.m4
@@ -2,7 +2,7 @@
 
 # autoconf tests required for use of xstrtoumax.c
 
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
 [
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])