diff --git a/ChangeLog b/ChangeLog
index 0cf2fb60..1b72fccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-11  Pavel Roskin  <proski@gnu.org>
+
+	* acfunctions.m4 (AC_CHECK_FUNCS): Add missing m4 quotes.
+	(AC_FUNC_GETPGRP): Likewise.
+	* acspecific.m4 (AC_AIX): Likewise.
+	* m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
+	* m4/missing.m4 (AM_MISSING_PROG): Likewise.
+	* m4/sanity.m4 (AM_SANITY_CHECK): Likewise.
+
 2000-11-11  Pavel Roskin  <proski@gnu.org>
 
 	* acfunctions.m4: Always quote first argument of AC_MSG_ERROR,
diff --git a/acfunctions.m4 b/acfunctions.m4
index a6d124ea..3222460d 100644
--- a/acfunctions.m4
+++ b/acfunctions.m4
@@ -84,7 +84,7 @@ AC_DEFUN([AC_CHECK_FUNCS],
 for ac_func in $1
 do
 AC_CHECK_FUNC($ac_func,
-              [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_func)) $2],
+              [AC_DEFINE_UNQUOTED([AC_TR_CPP([HAVE_$ac_func])]) $2],
               [$3])dnl
 done
 ])
@@ -629,7 +629,7 @@ main ()
       exit (s>>8);
     }
 }], ac_cv_func_getpgrp_void=yes, ac_cv_func_getpgrp_void=no,
-   AC_MSG_ERROR([cannot check getpgrp if cross compiling]))
+   [AC_MSG_ERROR([cannot check getpgrp if cross compiling])])
 ])
 if test $ac_cv_func_getpgrp_void = yes; then
   AC_DEFINE(GETPGRP_VOID, 1,
diff --git a/acspecific.m4 b/acspecific.m4
index a1c3b2a9..77ad592a 100644
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -1637,7 +1637,7 @@ AC_EGREP_CPP(yes,
 ],
 [AC_MSG_RESULT([yes])
 AC_DEFINE(_ALL_SOURCE)],
-AC_MSG_RESULT([no]))
+[AC_MSG_RESULT([no])])
 ])# AC_AIX
 
 
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index a6d124ea..3222460d 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -84,7 +84,7 @@ AC_DEFUN([AC_CHECK_FUNCS],
 for ac_func in $1
 do
 AC_CHECK_FUNC($ac_func,
-              [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_$ac_func)) $2],
+              [AC_DEFINE_UNQUOTED([AC_TR_CPP([HAVE_$ac_func])]) $2],
               [$3])dnl
 done
 ])
@@ -629,7 +629,7 @@ main ()
       exit (s>>8);
     }
 }], ac_cv_func_getpgrp_void=yes, ac_cv_func_getpgrp_void=no,
-   AC_MSG_ERROR([cannot check getpgrp if cross compiling]))
+   [AC_MSG_ERROR([cannot check getpgrp if cross compiling])])
 ])
 if test $ac_cv_func_getpgrp_void = yes; then
   AC_DEFINE(GETPGRP_VOID, 1,
diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index a1c3b2a9..77ad592a 100644
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -1637,7 +1637,7 @@ AC_EGREP_CPP(yes,
 ],
 [AC_MSG_RESULT([yes])
 AC_DEFINE(_ALL_SOURCE)],
-AC_MSG_RESULT([no]))
+[AC_MSG_RESULT([no])])
 ])# AC_AIX
 
 
diff --git a/m4/init.m4 b/m4/init.m4
index 9bfdd148..7fc6032b 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -18,8 +18,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
diff --git a/m4/missing.m4 b/m4/missing.m4
index 6d383f2b..48045b72 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -4,15 +4,15 @@
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
 AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
+[AC_MSG_CHECKING([for working $2])
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if ($2 --version) < /dev/null > /dev/null 2>&1; then
    $1=$2
-   AC_MSG_RESULT(found)
+   AC_MSG_RESULT([found])
 else
    $1="$SHELL $3/missing $2"
-   AC_MSG_RESULT(missing)
+   AC_MSG_RESULT([missing])
 fi
 AC_SUBST($1)])
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index 84c1eee3..776ce20f 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -39,4 +39,4 @@ else
 Check your system clock])
 fi
 rm -f conftest*
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])])