Document --trace=macro:format in --help output.

* bin/autom4te.in (help): Mention optional trace format.
* bin/autoconf.as (usage): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 8be5d0efdb09e1710708d8c71e8cf7d0b0f18abb..b13c28063556f96c31fe9ee8be8f02509b4f8e34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-26  Eric Blake  <ebb9@byu.net>
 
+       Document --trace=macro:format in --help output.
+       * bin/autom4te.in (help): Mention optional trace format.
+       * bin/autoconf.as (usage): Likewise.
+
        * doc/autoconf.texi (Limitations of Usual Tools) <sed>: Fix
        typos in last patch.
        Reported by Ralf Wildenhues.

diff --git a/bin/autoconf.as b/bin/autoconf.as
index dbabc308b139369444b53d0492966eceae2c3385..9e63aaa214c6b9b91eb776b394f66d71d910469d 100644 (file)
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -4,7 +4,7 @@ m4_divert_push([HEADER-COPYRIGHT])dnl
 # autoconf -- create `configure' using m4 macros
 
 # Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2004, 2005, 2006, 2007, 2008 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
@@ -54,10 +54,11 @@ Library directories:
   -I, --include=DIR          append directory DIR to search path
 
 Tracing:
-  -t, --trace=MACRO     report the list of calls to MACRO
-  -i, --initialization  also trace Autoconf's initialization process
+  -t, --trace=MACRO[:FORMAT]  report the list of calls to MACRO
+  -i, --initialization        also trace Autoconf's initialization process
 
-In tracing mode, no configuration script is created.
+In tracing mode, no configuration script is created.  FORMAT defaults
+to \`\$f:\$l:\$n:\$%'; see \`autom4te --help' for information about FORMAT.
 
 Report bugs to <bug-autoconf@gnu.org>."]
 

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 8efe537a46620028be59a4c4ed821785bfce81d6..14ad9b436f907f09dc7c404bb49231c53cb8b637 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
     if 0;
 
 # autom4te - Wrapper around M4 libraries.
-# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007 Free Software
+# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008 Free Software
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -197,12 +197,25 @@ Library directories:
   -I, --include=DIR          append directory DIR to search path
 
 Tracing:
-  -t, --trace=MACRO      report the MACRO invocations
-  -p, --preselect=MACRO  prepare to trace MACRO in a future run
+  -t, --trace=MACRO[:FORMAT]  report the MACRO invocations
+  -p, --preselect=MACRO       prepare to trace MACRO in a future run
 
 Freezing:
   -F, --freeze   produce an M4 frozen state file for FILES
 
+FORMAT defaults to \`\$f:\$l:\$n:\$%\', and can use the following escapes:
+  \$\$     literal \$
+  \$f     file where macro was called
+  \$l     line where macro was called
+  \$d     nesting depth of macro call
+  \$n     name of the macro
+  \$NUM   argument NUM, unquoted and with newlines
+  \$SEP\@  all arguments, with newlines, quoted, and separated by SEP
+  \$SEP*  all arguments, with newlines, unquoted, and separated by SEP
+  \$SEP%  all arguments, without newlines, unquoted, and separated by SEP
+SEP can be empty for the default (comma for \@ and *, colon for %),
+a single character for that character, or {STRING} to use a string.
+
 Report bugs to <bug-autoconf\@gnu.org>.
 ";