Re: branch-1_4 --help cleanup

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> 
> This makes --help and --version comply with GNU Coding Standards.

And this followon for head, to make the two similar (except that since we use 
gettext on head, we can make Rene's name look nicer):

2006-07-27  Eric Blake  <address@hidden>

        * src/main.c (usage): Update to match branch.
        (main): Update --version info to distinguish between program name
        `m4' and package name `GNU M4'.
        (AUTHORS): Translate Rene' Seindal's name.
        * configure.ac (TIMESTAMP): Remove now-redundant parentheses.
        * Makefile.am (doc/m4.1): Update to match branch.
        * m4/m4.c (DEFAULT_NESTING_LIMIT): Raise to 1024, to match
        branch.

Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.50
diff -u -r1.50 configure.ac
--- configure.ac        17 Jul 2006 17:55:40 -0000      1.50
+++ configure.ac        27 Jul 2006 22:29:17 -0000
@@ -41,7 +41,7 @@
 case AC_PACKAGE_VERSION in
   *[[acegikmoqsuwy]])
     TIMESTAMP=`$CONFIG_SHELL $ac_aux_dir/mkstamp < $srcdir/ChangeLog`
-    test -z "$TIMESTAMP" || TIMESTAMP=" (Build:$TIMESTAMP)"
+    test -z "$TIMESTAMP" || TIMESTAMP=" Build:$TIMESTAMP"
     AS_BOX([Configuring AC_PACKAGE_TARNAME][$TIMESTAMP AC_PACKAGE_VERSION])
     echo
     ;;
Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- Makefile.am 15 Jul 2006 21:35:37 -0000      1.41
+++ Makefile.am 27 Jul 2006 22:29:17 -0000
@@ -273,7 +273,8 @@
        @if test -f src/m4$(EXEEXT); then \
          echo "Updating the \`man' page \`$@'"; \
          $(SHELL) $(srcdir)/$(config_aux_dir)/missing --run \
-           help2man -o $@ src/m4$(EXEEXT); \
+           help2man --name="macro processor" --source=FSF \
+           --info-page=m4 --output=$@ src/m4$(EXEEXT); \
        else \
          echo "WARNING: The \`man' page \`$@' cannot be updated yet."; \
          echo "         Retry once the program executable is ready."; \
Index: m4/m4.c
===================================================================
RCS file: /sources/m4/m4/m4/m4.c,v
retrieving revision 1.15
diff -u -r1.15 m4.c
--- m4/m4.c     1 May 2005 11:10:05 -0000       1.15
+++ m4/m4.c     27 Jul 2006 22:29:17 -0000
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2004
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2004, 2006
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 
 #include "m4private.h"
 
-#define DEFAULT_NESTING_LIMIT  250
+#define DEFAULT_NESTING_LIMIT  1024
 
 
 m4 *
@@ -99,7 +99,7 @@
 m4_context_field_table
 #undef M4FIELD
 
-#define M4OPT_BIT(bit, base)                                           \
+#define M4OPT_BIT(bit, base)                                           \
        bool (CONC(m4_get_, base)) (m4 *context)                        \
        {                                                               \
          assert (context);                                             \
@@ -108,7 +108,7 @@
 m4_context_opt_bit_table
 #undef M4OPT_BIT
 
-#define M4OPT_BIT(bit, base)                                           \
+#define M4OPT_BIT(bit, base)                                           \
        bool (CONC(m4_set_, base)) (m4 *context, bool value)            \
        {                                                               \
          assert (context);                                             \
Index: src/main.c
===================================================================
RCS file: /sources/m4/m4/src/main.c,v
retrieving revision 1.70
diff -u -r1.70 main.c
--- src/main.c  27 Jul 2006 13:29:31 -0000      1.70
+++ src/main.c  27 Jul 2006 22:29:17 -0000
@@ -25,6 +25,8 @@
 #include "version-etc.h"
 #include "gnu/progname.h"
 
+#define AUTHORS _("Rene' Seindal"), "Gary V. Vaughan"
+
 static void print_program_name_CB (void);
 
 
@@ -96,6 +98,11 @@
     {
       printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name);
       fputs (_("\
+Process macros in FILEs.\n\
+If no FILE or if FILE is `-', standard input is read.\n\
+"), stdout);
+      fputs (_("\
+\n\
 Mandatory or optional arguments to long options are mandatory or optional\n\
 for short options too.\n\
 \n\
@@ -108,48 +115,48 @@
   -e, --interactive            unbuffer output, ignore interrupts\n\
   -P, --prefix-builtins        force a `m4_' prefix to all builtins\n\
   -Q, --quiet, --silent        suppress some warnings for builtins\n\
-  -r, --regexp-syntax=SPEC     change the default regexp syntax\n"),
-            stdout);
+  -r, --regexp-syntax=SPEC     change the default regexp syntax\n\
+"), stdout);
       fputs (_("\
 \n\
 SPEC is any one of:\n\
   AWK, BASIC, BSD_M4, ED, EMACS, EXTENDED, GNU_AWK, GNU_EGREP, GNU_M4,\n\
-  GREP, POSIX_AWK, POSIX_EGREP, MINIMAL, MINIMAL_BASIC, SED.\n"),
-            stdout);
+  GREP, POSIX_AWK, POSIX_EGREP, MINIMAL, MINIMAL_BASIC, SED.\n\
+"), stdout);
       printf (_("\
 \n\
 Dynamic loading features:\n\
   -M, --module-directory=DIRECTORY  add DIRECTORY to the module search path\n\
-  -m, --load-module=MODULE          load dynamic MODULE from %s\n"),
-            USER_MODULE_PATH_ENV);
+  -m, --load-module=MODULE          load dynamic MODULE from %s\n\
+"), USER_MODULE_PATH_ENV);
       fputs (_("\
 \n\
 Preprocessor features:\n\
-  -D, --define=NAME[=VALUE]    enter NAME has having VALUE, or empty\n\
-  -I, --include=DIRECTORY      search this directory second for includes\n\
-  -s, --synclines              generate `#line NO \"FILE\"' lines\n\
-  -U, --undefine=NAME          delete builtin NAME\n"),
-            stdout);
+  -D, --define=NAME[=VALUE]    define NAME has having VALUE, or empty\n\
+  -I, --include=DIRECTORY      append DIRECTORY to include path\n\
+  -s, --synclines              generate `#line NUM \"FILE\"' lines\n\
+  -U, --undefine=NAME          undefine NAME\n\
+"), stdout);
       fputs (_("\
 \n\
 Limits control:\n\
   -G, --traditional            suppress all GNU extensions\n\
-  -L, --nesting-limit=NUMBER   change artificial nesting limit\n"),
-            stdout);
+  -L, --nesting-limit=NUMBER   change artificial nesting limit [1024]\n\
+"), stdout);
       fputs (_("\
 \n\
 Frozen state files:\n\
   -F, --freeze-state=FILE      produce a frozen state on FILE at end\n\
-  -R, --reload-state=FILE      reload a frozen state from FILE at start\n"),
-            stdout);
+  -R, --reload-state=FILE      reload a frozen state from FILE at start\n\
+"), stdout);
       fputs (_("\
 \n\
 Debugging:\n\
   -d, --debug[=FLAGS]          set debug level (no FLAGS implies `aeq')\n\
   -l, --arglength=NUM          restrict macro tracing size\n\
   -o, --error-output=FILE      redirect debug and trace output\n\
-  -t, --trace=NAME             trace NAME when it will be defined\n"),
-            stdout);
+  -t, --trace=NAME             trace NAME when it will be defined\n\
+"), stdout);
       fputs (_("\
 \n\
 FLAGS is any of:\n\
@@ -162,20 +169,15 @@
   p   show results of path searches\n\
   q   quote values as necessary, with a or e flag\n\
   t   trace for all macro calls, not only traceon'ed\n\
+  x   add a unique macro call id, useful with c flag\n\
   V   shorthand for all of the above flags\n\
-  x   add a unique macro call id, useful with c flag\n"),
-            stdout);
-      fputs (_("\
-\n\
-If no FILE or if FILE is `-', standard input is read.\n"),
-            stdout);
+"), stdout);
       fputs (_("\
 \n\
 Exit status is 0 for success, 1 for failure, 63 for frozen file version\n\
 mismatch, or whatever value was passed to the m4exit macro.\n\
 "), stdout);
-
-      fputs (_("\nReport bugs to <address@hidden>.\n"), stdout);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);
 }
@@ -390,8 +392,8 @@
 
   if (show_version)
     {
-      version_etc (stdout, NULL, "GNU " PACKAGE TIMESTAMP,
-                  VERSION, "Rene' Seindal", "Gary V. Vaughan", NULL);
+      version_etc (stdout, PACKAGE, PACKAGE_NAME TIMESTAMP,
+                  VERSION, AUTHORS, NULL);
       exit (EXIT_SUCCESS);
     }