04-dumpdef-stderr.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * modules/m4.c (m4_dumpdef): Output to stderr, not m4_debug.
        (m4_errprint): Use fputs.
        * doc/m4.texinfo (Invoking m4) <--error-output>: errprint and
        dumpdef are not concerned.
        (Dumpdef, Errprint): Emphasize their insensitivity to
        --error-output.
        * doc/Makefile.am: Add `TAGS' support.
        (MAINTAINERCLEANFILES): Remove texinfo.tex and mdate-sh which are
        in `config/' now.
        * config/Makefile.am (MAINTAINERCLEANFILES): New.

Index: config/Makefile.am
--- config/Makefile.am Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ config/Makefile.am Thu, 16 Aug 2001 12:56:19 +0200 akim
@@ -19,6 +19,17 @@
 ##
 ## Written by Akim Demaille <address@hidden>

+MAINTAINERCLEANFILES =                         \
+Makefile.in                                    \
+config.guess                                   \
+config.sub                                     \
+install-sh                                     \
+ltmain.sh                                      \
+mdate-sh                                       \
+missing                                                \
+mkinstalldirs                                  \
+texinfo.tex
+
 EXTRA_DIST =                                   \
 debug.m4                                       \
 gmp.m4                                         \
Index: doc/m4.texinfo
--- doc/m4.texinfo Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ doc/m4.texinfo Thu, 16 Aug 2001 13:01:37 +0200 akim
@@ -17,7 +17,8 @@
 @ifinfo
 This file documents GNU @code{m4} @value{VERSION}

-Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000 Free 
Software Foundation, Inc.
+Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1
@@ -43,7 +44,8 @@

 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1989, 90, 91, 92, 93, 94, 98, 99, 2000 Free Software 
Foundation, Inc.
+Copyright @copyright{} 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999,
+2000, 2001 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1
@@ -459,9 +461,10 @@ options:

 @item -o @var{FILE}
 @itemx address@hidden
-Redirect debug and trace output to the named file.  Error messages are
-still printed on the standard error output.  @xref{Debug Output}, for
-more details.
+Redirect debug and trace output to the named file.  Error messages (from
address@hidden) and macro definitions (from @code{dumpdef}) are still
+printed on the standard error output.  @xref{Debug Output}, for more
+details.

 @item -B
 @itemx -S
@@ -1668,7 +1671,8 @@ @node Dumpdef
 @code{dumpdef} accepts any number of arguments.  If called without any
 arguments, it displays the definitions of all known names, otherwise it
 displays the definitions of the names given.  The output is printed
-directly on the standard error output.
+directly on the standard error output, independently of
address@hidden

 The expansion of @code{dumpdef} is void.
 @end deffn
@@ -3517,7 +3521,7 @@ @node Errprint
 @deffn {Builtin (m4)} errprint (@var{message}, @dots{})
 You can print error messages using @code{errprint}, which simply prints
 @var{message} and the rest of the arguments on the standard error
-output.
+output, independently of @option{--error-output}.

 The expansion of @code{errprint} is void.
 @end deffn
Index: doc/Makefile.am
--- doc/Makefile.am Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ doc/Makefile.am Thu, 16 Aug 2001 12:57:09 +0200 akim
@@ -1,16 +1,16 @@
 ## This file is part of GNU m4
-## Copyright 2000 Free Software Foundation, Inc.
-##
+## Copyright 2000, 2001 Free Software Foundation, Inc.
+##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-##
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -22,7 +22,12 @@

 EXTRA_DIST = helptoman.pl # $(MANS)

-MAINTAINERCLEANFILES = Makefile.in mdate-sh texinfo.tex m4.1
+# Automake 1.4 does not support TAGS_FILES directly.
+TAGS_FILES = $(info_TEXINFOS)
+TAGS_DEPENDENCIES = $(TAGS_FILES)
+ETAGS_ARGS = --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES)
+
+MAINTAINERCLEANFILES = Makefile.in m4.1

 PERL = @PERL@

@@ -36,4 +41,3 @@
          echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
          echo "         Retry once the program executable will be ready."; \
        fi
-
Index: modules/m4.c
--- modules/m4.c Fri, 10 Aug 2001 14:01:13 +0200 akim
+++ modules/m4.c Thu, 16 Aug 2001 13:05:40 +0200 akim
@@ -270,16 +270,16 @@

   for (; data.size > 0; --data.size, data.base++)
     {
-      M4_DEBUG_PRINT1 ("%s:\t", SYMBOL_NAME (data.base[0]));
+      fprintf (stderr, "%s:\t", SYMBOL_NAME (data.base[0]));

       switch (SYMBOL_TYPE (data.base[0]))
        {
        case M4_TOKEN_TEXT:
          if (debug_level & M4_DEBUG_TRACE_QUOTE)
-           M4_DEBUG_PRINT3 ("%s%s%s\n",
-                         lquote.string, SYMBOL_TEXT (data.base[0]), 
rquote.string);
+           fprintf (stderr, "%s%s%s\n",
+                    lquote.string, SYMBOL_TEXT (data.base[0]), rquote.string);
          else
-           M4_DEBUG_PRINT1 ("%s\n", SYMBOL_TEXT (data.base[0]));
+           fprintf (stderr, "%s\n", SYMBOL_TEXT (data.base[0]));
          break;

        case M4_TOKEN_FUNC:
@@ -290,7 +290,7 @@
                        _("Undefined name `%s'"), SYMBOL_NAME (data.base[0])));
              abort ();
            }
-         M4_DEBUG_PRINT1 ("<%s>\n", bp->name);
+         fprintf (stderr, "<%s>\n", bp->name);
          break;

        default:
@@ -603,7 +603,7 @@
 {
   m4_dump_args (obs, argc, argv, " ", FALSE);
   obstack_1grow (obs, '\0');
-  fprintf (stderr, "%s", (char *) obstack_finish (obs));
+  fputs ((char *) obstack_finish (obs), stderr);
   fflush (stderr);
 }