From df1dd2b21c7e0e20057dad61568cf3769c327344 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Wed, 2 Aug 2000 08:59:15 +0000
Subject: [PATCH] * m4: Quote properly the name of the macros being defined.
 Use `#' instead of `dnl' where appropriate. * m4/header.m4
 (AM_CONFIG_HEADER): Get rid of changequote, just quote. Don't quote passive
 characters. Pull the AC_PREREQ outside the macro. * m4/init.m4: Pull the
 AC_PREREQ outside the macro.

---
 ChangeLog         | 10 ++++++++++
 m4/ccstdc.m4      |  2 +-
 m4/cond.m4        |  2 +-
 m4/depend.m4      | 20 ++++++++++----------
 m4/depout.m4      | 18 +++++++++---------
 m4/dmalloc.m4     |  2 +-
 m4/error.m4       |  6 +++---
 m4/gcj.m4         |  6 +++---
 m4/header.m4      | 41 +++++++++++++++++++++++------------------
 m4/init.m4        | 11 ++++++-----
 m4/lex.m4         |  6 +++---
 m4/lispdir.m4     |  2 +-
 m4/maintainer.m4  |  2 +-
 m4/minuso.m4      |  6 +++---
 m4/missing.m4     | 18 +++++++++---------
 m4/multi.m4       | 12 ++++++------
 m4/obstack.m4     |  6 +++---
 m4/protos.m4      |  2 +-
 m4/ptrdiff.m4     |  2 +-
 m4/python.m4      | 38 +++++++++++++++++++-------------------
 m4/regex.m4       |  2 +-
 m4/sanity.m4      |  2 +-
 m4/strtod.m4      |  2 +-
 m4/termios.m4     |  4 ++--
 m4/winsz.m4       |  4 ++--
 tests/ChangeLog   |  6 +++++-
 tests/depacl.test |  2 +-
 27 files changed, 127 insertions(+), 107 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index feb27368..f07afecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-08-02  Akim Demaille  <akim@epita.fr>
+
+	* m4: Quote properly the name of the macros being defined.
+	Use `#' instead of `dnl' where appropriate.
+	* m4/header.m4 (AM_CONFIG_HEADER): Get rid of changequote, just
+	quote.
+	Don't quote passive characters.
+	Pull the AC_PREREQ outside the macro.
+	* m4/init.m4: Pull the AC_PREREQ outside the macro.
+
 2000-07-28  Tom Tromey  <tromey@cygnus.com>
 
 	* lisp.am (uninstall-@DIR@LISP): Prefix file with $(DESTDIR).
diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
index 91f2ed00..bf472f05 100644
--- a/m4/ccstdc.m4
+++ b/m4/ccstdc.m4
@@ -20,7 +20,7 @@
 # program @code{ansi2knr}, which comes with Ghostscript.
 # @end defmac
 
-AC_DEFUN(AM_PROG_CC_STDC,
+AC_DEFUN([AM_PROG_CC_STDC],
 [AC_REQUIRE([AC_PROG_CC])
 AC_BEFORE([$0], [AC_C_INLINE])
 AC_BEFORE([$0], [AC_C_CONST])
diff --git a/m4/cond.m4 b/m4/cond.m4
index 8734d611..4eb2e9d1 100644
--- a/m4/cond.m4
+++ b/m4/cond.m4
@@ -1,6 +1,6 @@
 # Define a conditional.
 
-AC_DEFUN(AM_CONDITIONAL,
+AC_DEFUN([AM_CONDITIONAL],
 [AC_SUBST($1_TRUE)
 AC_SUBST($1_FALSE)
 if $2; then
diff --git a/m4/depend.m4 b/m4/depend.m4
index c768e68c..fb8f07eb 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,11 +1,11 @@
-dnl See how the compiler implements dependency checking.
-dnl Usage:
-dnl AM_DEPENDENCIES(NAME)
-dnl NAME is "CC", "CXX" or "OBJC".
+# See how the compiler implements dependency checking.
+# Usage:
+# AM_DEPENDENCIES(NAME)
+# NAME is "CC", "CXX" or "OBJC".
 
-dnl We try a few techniques and use that to set a single cache variable.
+# We try a few techniques and use that to set a single cache variable.
 
-AC_DEFUN(AM_DEPENDENCIES,[
+AC_DEFUN([AM_DEPENDENCIES],[
 AC_REQUIRE([AM_SET_DEPDIR])
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
 ifelse([$1],CC,[
@@ -61,10 +61,10 @@ AC_MSG_RESULT($am_cv_[$1]_dependencies_compiler_type)
 AC_SUBST([$1]DEPMODE)
 ])
 
-dnl Choose a directory name for dependency files.
-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in AM_DEPENDENCIES
 
-AC_DEFUN(AM_SET_DEPDIR,[
+AC_DEFUN([AM_SET_DEPDIR],[
 if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
   DEPDIR=.deps
 else
@@ -73,7 +73,7 @@ fi
 AC_SUBST(DEPDIR)
 ])
 
-AC_DEFUN(AM_DEP_TRACK,[
+AC_DEFUN([AM_DEP_TRACK],[
 AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors])
diff --git a/m4/depout.m4 b/m4/depout.m4
index e79edf86..1f49b764 100644
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -1,13 +1,13 @@
-dnl Generate code to set up dependency tracking.
-dnl This macro should only be invoked once -- use via AC_REQUIRE.
-dnl Usage:
-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
+# Generate code to set up dependency tracking.
+# This macro should only be invoked once -- use via AC_REQUIRE.
+# Usage:
+# AM_OUTPUT_DEPENDENCY_COMMANDS
 
-dnl
-dnl This code is only required when automatic dependency tracking
-dnl is enabled.  FIXME.  This creates each `.P' file that we will
-dnl need in order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
 AC_OUTPUT_COMMANDS([
 test x"$AMDEP" != x"" ||
 for mf in $CONFIG_FILES; do
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index 244398a9..6828c9f9 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -5,7 +5,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_WITH_DMALLOC,
+AC_DEFUN([AM_WITH_DMALLOC],
 [AC_MSG_CHECKING(if malloc debugging is wanted)
 AC_ARG_WITH(dmalloc,
 [  --with-dmalloc          use dmalloc, as in
diff --git a/m4/error.m4 b/m4/error.m4
index 96826534..fc8b4649 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,7 +1,7 @@
-dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
+# From Jim Meyering.  Use this if you use the GNU error.[ch].
+# FIXME: Migrate into libit
 
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
 [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
  [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
               am_cv_lib_error_at_line=yes,
diff --git a/m4/gcj.m4 b/m4/gcj.m4
index 34677afe..359733bd 100644
--- a/m4/gcj.m4
+++ b/m4/gcj.m4
@@ -1,7 +1,7 @@
-dnl Check for Java compiler.
-dnl For now we only handle the GNU compiler.
+# Check for Java compiler.
+# For now we only handle the GNU compiler.
 
-AC_DEFUN(AM_PROG_GCJ,[
+AC_DEFUN([AM_PROG_GCJ],[
 AC_CHECK_PROGS(GCJ, gcj, gcj)
 test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH])
 if test "x${GCJFLAGS+set}" = xset; then
diff --git a/m4/header.m4 b/m4/header.m4
index 95ccb616..3f455572 100644
--- a/m4/header.m4
+++ b/m4/header.m4
@@ -1,22 +1,27 @@
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+# serial 2
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  We must strip everything past the first ":",
+# and everything past the last "/".
+
+AC_PREREQ([2.12])
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_CONFIG_HEADER([$1])
+AC_OUTPUT_COMMANDS(
+[ifelse(patsubst([$1], [[^ ]], []),
+        [],
+        [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+         patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h])],
+[am_indx=1
+for am_file in $1; do
+  case " $CONFIG_HEADERS " in
+  *" $am_file "*)
+    echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
     ;;
   esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+  am_indx=`expr "$am_indx" + 1`
+done])
diff --git a/m4/init.m4 b/m4/init.m4
index 403f4f05..ef6fb889 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -2,7 +2,9 @@
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
 
-# serial 2
+# serial 3
+
+AC_PREREQ([2.13])
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 # -----------------------------------------------------------
@@ -20,9 +22,8 @@ ifdef([AC_PROVIDE_IFELSE],
 
 # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
 # ----------------------------------------------
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
 # test to see if srcdir already configured
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
@@ -49,8 +50,8 @@ AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
 AM_MISSING_PROG(AMTAR, tar)
 AM_MISSING_INSTALL_SH
-dnl We need awk for the "check" target.  The system "awk" is bad on
-dnl some platforms.
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
diff --git a/m4/lex.m4 b/m4/lex.m4
index f3c20e5c..78f05100 100644
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -1,9 +1,9 @@
 ## Replacement for AC_PROG_LEX and AC_DECL_YYTEXT
 ## by Alexandre Oliva <oliva@dcc.unicamp.br>
 
-dnl AM_PROG_LEX
-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
-AC_DEFUN(AM_PROG_LEX,
+# AM_PROG_LEX
+# Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+AC_DEFUN([AM_PROG_LEX],
 [AC_REQUIRE([AM_MISSING_HAS_RUN])
 AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
 AC_PROG_LEX
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 009a0e0f..59b4678c 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -6,7 +6,7 @@
 
 # serial 3
 
-AC_DEFUN(AM_PATH_LISPDIR,
+AC_DEFUN([AM_PATH_LISPDIR],
  [AC_ARG_WITH(lispdir, 
   [   --with-lispdir            Override the default lisp directory ],
   [ lispdir="$withval" 
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index 95f13869..4e8f3488 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -3,7 +3,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_MAINTAINER_MODE,
+AC_DEFUN([AM_MAINTAINER_MODE],
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
diff --git a/m4/minuso.m4 b/m4/minuso.m4
index a28db55c..e81df6f1 100644
--- a/m4/minuso.m4
+++ b/m4/minuso.m4
@@ -1,9 +1,9 @@
-dnl Like AC_PROG_CC_C_O, but changed for automake.
+# Like AC_PROG_CC_C_O, but changed for automake.
 
 AC_DEFUN([AM_PROG_CC_C_O],[
 AC_REQUIRE([AC_PROG_CC_C_O])
-dnl FIXME: we rely on the cache variable name because
-dnl there is no other way.
+# FIXME: we rely on the cache variable name because
+# there is no other way.
 set dummy $CC; ac_cc="`echo [$]2 |
 changequote(, )dnl
 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
diff --git a/m4/missing.m4 b/m4/missing.m4
index 70c13a21..1b6b1f55 100644
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -1,15 +1,15 @@
 ## --------------------------------------------------------- ##
 ## Fake the existence of programs that GNU maintainers use.  ##
 ## --------------------------------------------------------- ##
-dnl AM_MISSING_PROG(NAME, PROGRAM)
-AC_DEFUN(AM_MISSING_PROG, [
+# AM_MISSING_PROG(NAME, PROGRAM)
+AC_DEFUN([AM_MISSING_PROG], [
 AC_REQUIRE([AM_MISSING_HAS_RUN])
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-dnl Like AM_MISSING_PROG, but only looks for install-sh.
-dnl AM_MISSING_INSTALL_SH()
-AC_DEFUN(AM_MISSING_INSTALL_SH, [
+# Like AM_MISSING_PROG, but only looks for install-sh.
+# AM_MISSING_INSTALL_SH()
+AC_DEFUN([AM_MISSING_INSTALL_SH], [
 AC_REQUIRE([AM_MISSING_HAS_RUN])
 if test -z "$install_sh"; then
    install_sh="$ac_aux_dir/install-sh"
@@ -21,13 +21,13 @@ if test -z "$install_sh"; then
 fi
 AC_SUBST(install_sh)])
 
-dnl AM_MISSING_HAS_RUN.
-dnl Define MISSING if not defined so far and test if it supports --run.
-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
+# AM_MISSING_HAS_RUN.
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN], [
 test x"${MISSING+set}" = xset || \
   MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
-dnl Use eval to expand $SHELL
+# Use eval to expand $SHELL
 if eval "$MISSING --run :"; then
   am_missing_run="$MISSING --run "
 else
diff --git a/m4/multi.m4 b/m4/multi.m4
index 3583331b..ef986883 100644
--- a/m4/multi.m4
+++ b/m4/multi.m4
@@ -1,8 +1,8 @@
-dnl Add --enable-multilib to configure.
-dnl Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]])
+# Add --enable-multilib to configure.
+# Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]])
 
-AC_DEFUN(AM_ENABLE_MULTILIB, [
-dnl Default to --enable-multilib
+AC_DEFUN([AM_ENABLE_MULTILIB], [
+# Default to --enable-multilib
 AC_ARG_ENABLE(multilib,
 [  --enable-multilib         build many library versions (default)],
 [case "${enableval}" in
@@ -11,8 +11,8 @@ AC_ARG_ENABLE(multilib,
   *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
  esac], [multilib=yes]
 
-dnl We may get other options which we are undocumented:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
+# We may get other options which we are undocumented:
+# --with-target-subdir, --with-multisrctop, --with-multisubdir
 
 if test "[$]{srcdir}" = "."; then
   if test "[$]{with_target_subdir}" != "."; then
diff --git a/m4/obstack.m4 b/m4/obstack.m4
index 273caff1..0ef6f0ad 100644
--- a/m4/obstack.m4
+++ b/m4/obstack.m4
@@ -1,7 +1,7 @@
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
+# From Jim Meyering.
+# FIXME: migrate into libit.
 
-AC_DEFUN(AM_FUNC_OBSTACK,
+AC_DEFUN([AM_FUNC_OBSTACK],
 [AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
  [AC_TRY_LINK([#include "obstack.h"],
 	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
diff --git a/m4/protos.m4 b/m4/protos.m4
index 0079f74d..bbb58714 100644
--- a/m4/protos.m4
+++ b/m4/protos.m4
@@ -5,7 +5,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_C_PROTOTYPES,
+AC_DEFUN([AM_C_PROTOTYPES],
 [AC_REQUIRE([AM_PROG_CC_STDC])
 AC_REQUIRE([AC_PROG_CPP])
 AC_MSG_CHECKING([for function prototypes])
diff --git a/m4/ptrdiff.m4 b/m4/ptrdiff.m4
index 9818ddfc..687b6558 100644
--- a/m4/ptrdiff.m4
+++ b/m4/ptrdiff.m4
@@ -2,7 +2,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_TYPE_PTRDIFF_T,
+AC_DEFUN([AM_TYPE_PTRDIFF_T],
   [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t,
      [AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
 		     am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
diff --git a/m4/python.m4 b/m4/python.m4
index 0ee447e2..8efacb16 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -3,25 +3,25 @@
 ## From Andrew Dalke
 ## ------------------------
 
-dnl AM_PATH_PYTHON([package, module])
-dnl 
-
-dnl Adds support for distributing Python modules or the special form
-dnl of a module called a `package.'  Modules of the first type are 
-dnl files ending in `.py' with no '__init__.py' file.  This must be
-dnl placed on the PYTHONPATH, and the default location is PYTHON_SITE,
-dnl or $(prefix)/lib/python$(PYTHON_VERSION)/site-package
-dnl 
-dnl A package module is contained in its own directory.  This directory
-dnl is named PACKAGE, which was the name given to automake.  The full
-dnl directory path is PYTHON_SITE_PACKAGE or
-dnl   $(prefix)/lib/python$(PYTHON_VERSION)/site-package/$(PACKAGE)
-dnl where site-package is on the PYTHONPATH.  The `__init__.py' file is
-dnl located in the directory, along with any other submodules which may
-dnl be necessary.
-
-
-AC_DEFUN(AM_PATH_PYTHON,
+# AM_PATH_PYTHON([package, module])
+# 
+
+# Adds support for distributing Python modules or the special form
+# of a module called a `package.'  Modules of the first type are 
+# files ending in `.py' with no '__init__.py' file.  This must be
+# placed on the PYTHONPATH, and the default location is PYTHON_SITE,
+# or $(prefix)/lib/python$(PYTHON_VERSION)/site-package
+# 
+# A package module is contained in its own directory.  This directory
+# is named PACKAGE, which was the name given to automake.  The full
+# directory path is PYTHON_SITE_PACKAGE or
+#   $(prefix)/lib/python$(PYTHON_VERSION)/site-package/$(PACKAGE)
+# where site-package is on the PYTHONPATH.  The `__init__.py' file is
+# located in the directory, along with any other submodules which may
+# be necessary.
+
+
+AC_DEFUN([AM_PATH_PYTHON],
  [
   dnl Find a version of Python.  I could check for python versions 1.4
   dnl or earlier, but the default installation locations changed from
diff --git a/m4/regex.m4 b/m4/regex.m4
index 80c65243..406f258e 100644
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -14,7 +14,7 @@
 # If found, the package will use the system's rx which, on Linux at least,
 # will result in a smaller executable file.
 
-AC_DEFUN(AM_WITH_REGEX,
+AC_DEFUN([AM_WITH_REGEX],
 [AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted)
 AC_ARG_WITH(regex,
 [  --without-regex         use GNU rx in lieu of gawk's regex for matching],
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index 84c1eee3..ec7b1ff1 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -2,7 +2,7 @@
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index a090d958..22312c0b 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -27,7 +27,7 @@
 ## variable @code{LIBOBJS}.
 ## @end defmac
 
-AC_DEFUN(AM_FUNC_STRTOD,
+AC_DEFUN([AM_FUNC_STRTOD],
 [AC_CACHE_CHECK(for working strtod, am_cv_func_strtod,
 [AC_TRY_RUN([
 double strtod ();
diff --git a/m4/termios.m4 b/m4/termios.m4
index 1eb31d1e..d1698908 100644
--- a/m4/termios.m4
+++ b/m4/termios.m4
@@ -1,8 +1,8 @@
-dnl From Jim Meyering.
+# From Jim Meyering.
 
 # serial 1
 
-AC_DEFUN(AM_SYS_POSIX_TERMIOS,
+AC_DEFUN([AM_SYS_POSIX_TERMIOS],
 [AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios,
   [AC_TRY_LINK([#include <sys/types.h>
 #include <unistd.h>
diff --git a/m4/winsz.m4 b/m4/winsz.m4
index fa81c9d7..70be76ce 100644
--- a/m4/winsz.m4
+++ b/m4/winsz.m4
@@ -1,8 +1,8 @@
-dnl From Jim Meyering.
+# From Jim Meyering.
 
 # serial 1
 
-AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL,
+AC_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
 [AC_REQUIRE([AM_SYS_POSIX_TERMIOS])
  AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h],
 	        am_cv_sys_tiocgwinsz_needs_sys_ioctl_h,
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 13f2f5e0..98b09a68 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-02  Akim Demaille  <akim@epita.fr>
+
+	* depacl.test: Weaken the regexp looking for AM_PROG_CC_C_STDC in
+	aclocal.m4.
+
 2000-05-01  Pavel Roskin  <pavel_roskin@geocities.com>
 
 	* install2.test: Prevent automake from looking into .. and ../..
@@ -1283,4 +1288,3 @@ Sat Feb 10 17:08:39 1996  Tom Tromey  <tromey@creche.cygnus.com>
 	* mdate.test, vtexi.test, acoutput.test: New files.
 
 	* Started.
-
diff --git a/tests/depacl.test b/tests/depacl.test
index 7b04b82b..c8b22681 100755
--- a/tests/depacl.test
+++ b/tests/depacl.test
@@ -10,4 +10,4 @@ END
 
 $ACLOCAL || exit 1
 
-grep '^AC_DEFUN.AM_PROG_CC_STDC,$' aclocal.m4
+grep '^AC_DEFUN.*AM_PROG_CC_STDC' aclocal.m4
-- 
2.43.5