Fix for PR automake/14:

	* aclocal.in: Added `ud_GNU_GETTEXT'.  Updated to mention
	AC_CYGWIN.
	* automake.in: Mention AC_CYGWIN, not AC_CYGWIN32.

diff --git a/ChangeLog b/ChangeLog
index 4feabc3bc720a6ad5d36520de3a5f55821109aa3..b042309e43369b8ab0d2ab0ca11a9bdfd812026b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-11-12  Tom Tromey  <tromey@cygnus.com>
 
+       Fix for PR automake/14:
+       * aclocal.in: Added `ud_GNU_GETTEXT'.  Updated to mention
+       AC_CYGWIN.
+       * automake.in: Mention AC_CYGWIN, not AC_CYGWIN32.
+
        * m4/multi.m4: Added missing `]'.  From Akim Demaille.
 
        * Makefile.am (path-check): Make sure distdir is writeable before

diff --git a/aclocal.in b/aclocal.in
index ce7a1a23d3b9e4ccca3a12e3c7d8c3b8468c4b4d..472d1d08e349059a43d2c35b636388ee36260903 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -84,6 +84,7 @@ $verbosity = 0;
      'jm_MAINTAINER_MODE', "use \`AM_MAINTAINER_MODE'",
      'md_TYPE_PTRDIFF_T', "use \`AM_TYPE_PTRDIFF_T'",
      'ud_PATH_LISPDIR', "use \`AM_PATH_LISPDIR'",
+     'ud_GNU_GETTEXT', "use \`AM_GNU_GETTEXT'",
 
      # Now part of autoconf proper, under a different name.
      'AM_FUNC_FNMATCH', "use \`AC_FUNC_FNMATCH'",
@@ -91,7 +92,7 @@ $verbosity = 0;
      'AM_SANITY_CHECK_CC', "automatically done by \`AC_PROG_CC'",
      'AM_PROG_INSTALL', "use \`AC_PROG_INSTALL'",
      'AM_EXEEXT', "use \`AC_EXEEXT'",
-     'AM_CYGWIN32', "use \`AC_CYGWIN32'",
+     'AM_CYGWIN32', "use \`AC_CYGWIN'",
      'AM_MINGW32', "use \`AC_MINGW32'",
      'AM_FUNC_MKTIME', "use \`AC_FUNC_MKTIME'",
 
@@ -99,6 +100,7 @@ $verbosity = 0;
 #      'md_PATH_PROG',
      );
 
+# Regexp to match the above macros.
 $obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')';
 
 # Matches a macro definition.

diff --git a/automake.in b/automake.in
index 1a0494545d13a40a07faf8cec687625e996a17dd..8e099a658d52d4e28e6ae2fc261427c6dbf918ee 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -295,7 +295,7 @@ $cygnus_mode = 0;
      'AM_SANITY_CHECK_CC', "automatically done by \`AC_PROG_CC'",
      'AM_PROG_INSTALL', "use \`AC_PROG_INSTALL'",
      'AM_EXEEXT', "use \`AC_EXEEXT'",
-     'AM_CYGWIN32', "use \`AC_CYGWIN32'",
+     'AM_CYGWIN32', "use \`AC_CYGWIN'",
      'AM_MINGW32', "use \`AC_MINGW32'",
      'AM_FUNC_MKTIME', "use \`AC_FUNC_MKTIME'",