FYI: 1.4: Quote the names

[Akim Demaille]

This is really important if we want some nice interaction between 1.4p
and 2.50.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * m4/ccstdc.m4, m4/cond.m4, m4/dmalloc.m4, m4/error.m4,
        * m4/header.m4, m4/init.m4, m4/lex.m4, m4/lispdir.m4,
        * m4/maintainer.m4, m4/missing.m4, m4/mktime.m4, m4/multi.m4,
        * m4/obstack.m4, m4/protos.m4, m4/ptrdiff.m4, m4/regex.m4,
        * m4/sanity.m4, m4/strtod.m4, m4/termios.m4, m4/winsz.m4:
        Quote the name being defined.
        * tests/depacl.test: Adjust.

Index: m4/ccstdc.m4
===================================================================
RCS file: /cvs/automake/automake/m4/ccstdc.m4,v
retrieving revision 1.6
diff -u -u -r1.6 ccstdc.m4
--- m4/ccstdc.m4 1997/11/26 21:41:40 1.6
+++ m4/ccstdc.m4 2001/06/23 12:13:49
@@ -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])
Index: m4/cond.m4
===================================================================
RCS file: /cvs/automake/automake/m4/cond.m4,v
retrieving revision 1.1
diff -u -u -r1.1 cond.m4
--- m4/cond.m4 1997/04/28 05:59:43 1.1
+++ m4/cond.m4 2001/06/23 12:13:49
@@ -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
Index: m4/dmalloc.m4
===================================================================
RCS file: /cvs/automake/automake/m4/dmalloc.m4,v
retrieving revision 1.2
diff -u -u -r1.2 dmalloc.m4
--- m4/dmalloc.m4 1998/10/09 11:10:16 1.2
+++ m4/dmalloc.m4 2001/06/23 12:13:49
@@ -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
Index: m4/error.m4
===================================================================
RCS file: /cvs/automake/automake/m4/error.m4,v
retrieving revision 1.1
diff -u -u -r1.1 error.m4
--- m4/error.m4 1996/10/06 03:55:49 1.1
+++ m4/error.m4 2001/06/23 12:13:49
@@ -1,7 +1,7 @@
 dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
 dnl 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,
Index: m4/header.m4
===================================================================
RCS file: /cvs/automake/automake/m4/header.m4,v
retrieving revision 1.5
diff -u -u -r1.5 header.m4
--- m4/header.m4 1997/04/25 18:31:56 1.5
+++ m4/header.m4 2001/06/23 12:13:49
@@ -1,6 +1,6 @@
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+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.
Index: m4/init.m4
===================================================================
RCS file: /cvs/automake/automake/m4/init.m4,v
retrieving revision 1.9
diff -u -u -r1.9 init.m4
--- m4/init.m4 1998/10/09 11:10:17 1.9
+++ m4/init.m4 2001/06/23 12:13:49
@@ -7,7 +7,7 @@
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
Index: m4/lex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lex.m4,v
retrieving revision 1.2
diff -u -u -r1.2 lex.m4
--- m4/lex.m4 1998/04/05 19:59:03 1.2
+++ m4/lex.m4 2001/06/23 12:13:49
@@ -3,7 +3,7 @@
 
 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,
+AC_DEFUN([AM_PROG_LEX],
 [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
 AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
 AC_PROG_LEX
Index: m4/lispdir.m4
===================================================================
RCS file: /cvs/automake/automake/m4/lispdir.m4,v
retrieving revision 1.7
diff -u -u -r1.7 lispdir.m4
--- m4/lispdir.m4 1998/10/24 15:20:31 1.7
+++ m4/lispdir.m4 2001/06/23 12:13:49
@@ -5,7 +5,7 @@
 
 # serial 1
 
-AC_DEFUN(AM_PATH_LISPDIR,
+AC_DEFUN([AM_PATH_LISPDIR],
  [# If set to t, that means we are running in a shell under Emacs.
   # If you have an Emacs named "t", then use the full path.
   test "$EMACS" = t && EMACS=
Index: m4/maintainer.m4
===================================================================
RCS file: /cvs/automake/automake/m4/maintainer.m4,v
retrieving revision 1.3
diff -u -u -r1.3 maintainer.m4
--- m4/maintainer.m4 1998/10/03 18:26:55 1.3
+++ m4/maintainer.m4 2001/06/23 12:13:49
@@ -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,
Index: m4/missing.m4
===================================================================
RCS file: /cvs/automake/automake/m4/missing.m4,v
retrieving revision 1.4
diff -u -u -r1.4 missing.m4
--- m4/missing.m4 1997/04/26 05:07:53 1.4
+++ m4/missing.m4 2001/06/23 12:13:49
@@ -3,7 +3,7 @@
 ## --------------------------------------------------------- ##
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [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.
Index: m4/mktime.m4
===================================================================
RCS file: /cvs/automake/automake/m4/Attic/mktime.m4,v
retrieving revision 1.6
diff -u -u -r1.6 mktime.m4
--- m4/mktime.m4 1998/10/16 10:43:44 1.6
+++ m4/mktime.m4 2001/06/23 12:13:49
@@ -3,7 +3,7 @@
 dnl From Jim Meyering.
 dnl FIXME: this should migrate into libit.
 
-AC_DEFUN(AM_FUNC_MKTIME,
+AC_DEFUN([AM_FUNC_MKTIME],
 [AC_REQUIRE([AC_HEADER_TIME])dnl
  AC_CHECK_HEADERS(sys/time.h unistd.h)
  AC_CHECK_FUNCS(alarm)
Index: m4/multi.m4
===================================================================
RCS file: /cvs/automake/automake/m4/multi.m4,v
retrieving revision 1.1
diff -u -u -r1.1 multi.m4
--- m4/multi.m4 1998/10/11 13:07:31 1.1
+++ m4/multi.m4 2001/06/23 12:13:49
@@ -1,7 +1,7 @@
 dnl Add --enable-multilib to configure.
 dnl Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]])
 
-AC_DEFUN(AM_ENABLE_MULTILIB, [
+AC_DEFUN([AM_ENABLE_MULTILIB], [
 dnl Default to --enable-multilib
 AC_ARG_ENABLE(multilib,
 [  --enable-multilib         build many library versions (default)],
Index: m4/obstack.m4
===================================================================
RCS file: /cvs/automake/automake/m4/obstack.m4,v
retrieving revision 1.2
diff -u -u -r1.2 obstack.m4
--- m4/obstack.m4 1998/10/09 11:10:19 1.2
+++ m4/obstack.m4 2001/06/23 12:13:49
@@ -1,7 +1,7 @@
 dnl From Jim Meyering.
 dnl 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)],
Index: m4/protos.m4
===================================================================
RCS file: /cvs/automake/automake/m4/protos.m4,v
retrieving revision 1.4
diff -u -u -r1.4 protos.m4
--- m4/protos.m4 1998/10/09 11:10:20 1.4
+++ m4/protos.m4 2001/06/23 12:13:49
@@ -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])
Index: m4/ptrdiff.m4
===================================================================
RCS file: /cvs/automake/automake/m4/ptrdiff.m4,v
retrieving revision 1.2
diff -u -u -r1.2 ptrdiff.m4
--- m4/ptrdiff.m4 1998/10/09 11:10:21 1.2
+++ m4/ptrdiff.m4 2001/06/23 12:13:49
@@ -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)])
Index: m4/regex.m4
===================================================================
RCS file: /cvs/automake/automake/m4/regex.m4,v
retrieving revision 1.3
diff -u -u -r1.3 regex.m4
--- m4/regex.m4 1998/10/09 11:10:22 1.3
+++ m4/regex.m4 2001/06/23 12:13:49
@@ -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],
Index: m4/sanity.m4
===================================================================
RCS file: /cvs/automake/automake/m4/sanity.m4,v
retrieving revision 1.8
diff -u -u -r1.8 sanity.m4
--- m4/sanity.m4 1997/10/21 06:41:53 1.8
+++ m4/sanity.m4 2001/06/23 12:13:49
@@ -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
Index: m4/strtod.m4
===================================================================
RCS file: /cvs/automake/automake/m4/strtod.m4,v
retrieving revision 1.2
diff -u -u -r1.2 strtod.m4
--- m4/strtod.m4 1996/10/20 18:14:04 1.2
+++ m4/strtod.m4 2001/06/23 12:13:49
@@ -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 ();
Index: m4/termios.m4
===================================================================
RCS file: /cvs/automake/automake/m4/termios.m4,v
retrieving revision 1.1
diff -u -u -r1.1 termios.m4
--- m4/termios.m4 1996/10/06 03:55:51 1.1
+++ m4/termios.m4 2001/06/23 12:13:49
@@ -2,7 +2,7 @@
 
 # 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>
Index: m4/winsz.m4
===================================================================
RCS file: /cvs/automake/automake/m4/winsz.m4,v
retrieving revision 1.2
diff -u -u -r1.2 winsz.m4
--- m4/winsz.m4 1998/10/09 11:10:23 1.2
+++ m4/winsz.m4 2001/06/23 12:13:49
@@ -2,7 +2,7 @@
 
 # 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,
Index: tests/depacl.test
===================================================================
RCS file: /cvs/automake/automake/tests/depacl.test,v
retrieving revision 1.1
diff -u -u -r1.1 depacl.test
--- tests/depacl.test 1996/07/28 17:54:08 1.1
+++ tests/depacl.test 2001/06/23 12:13:49
@@ -10,4 +10,4 @@
 
 $ACLOCAL || exit 1
 
-grep '^AC_DEFUN.AM_PROG_CC_STDC,$' aclocal.m4
+grep '^AC_DEFUN.*AM_PROG_CC_STDC' aclocal.m4