Changes to m4/src/Attic/m4.c,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      06/09/20 03:59:42

Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.29
retrieving revision 1.1.1.1.2.30
diff -u -b -r1.1.1.1.2.29 -r1.1.1.1.2.30
--- src/m4.c    14 Sep 2006 14:55:54 -0000      1.1.1.1.2.29
+++ src/m4.c    20 Sep 2006 03:59:42 -0000      1.1.1.1.2.30
@@ -151,7 +151,7 @@
       fputs ("\
 \n\
 Preprocessor features:\n\
-  -D, --define=NAME[=VALUE]    define NAME has having VALUE, or empty\n\
+  -D, --define=NAME[=VALUE]    define NAME as 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\
@@ -173,9 +173,9 @@
 \n\
 Debugging:\n\
   -d, --debug[=FLAGS]          set debug level (no FLAGS implies `aeq')\n\
+      --debugfile=FILE         redirect debug and trace output\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\
+  -t, --trace=NAME             trace NAME when it is defined\n\
 ", stdout);
       fputs ("\
 \n\
@@ -218,7 +218,8 @@
    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
 enum
 {
-  DIVERSIONS_OPTION = CHAR_MAX + 1,    /* not quite -N, because of message */
+  DEBUGFILE_OPTION = CHAR_MAX + 1,     /* no short opt */
+  DIVERSIONS_OPTION,                   /* not quite -N, because of message */
 
   HELP_OPTION,                         /* no short opt */
   VERSION_OPTION                       /* no short opt */
@@ -229,7 +230,7 @@
   {"arglength", required_argument, NULL, 'l'},
   {"debug", optional_argument, NULL, 'd'},
   {"define", required_argument, NULL, 'D'},
-  {"error-output", required_argument, NULL, 'o'},
+  {"error-output", required_argument, NULL, 'o'}, /* FIXME: deprecate in 2.0 */
   {"fatal-warnings", no_argument, NULL, 'E'},
   {"freeze-state", required_argument, NULL, 'F'},
   {"hashsize", required_argument, NULL, 'H'},
@@ -246,6 +247,7 @@
   {"undefine", required_argument, NULL, 'U'},
   {"word-regexp", required_argument, NULL, 'W'},
 
+  {"debugfile", required_argument, NULL, DEBUGFILE_OPTION},
   {"diversions", required_argument, NULL, DIVERSIONS_OPTION},
 
   {"help", no_argument, NULL, HELP_OPTION},
@@ -399,6 +401,11 @@
        break;
 
       case 'o':
+       /* -o/--error-output are deprecated synonyms of --debugfile,
+          but don't issue a deprecation warning until autoconf 2.61
+          or later is more widely established, as such a warning
+          would interfere with all earlier versions of autoconf.  */
+      case DEBUGFILE_OPTION:
        if (!debug_set_output (optarg))
          error (0, errno, "%s", optarg);
        break;