Re: traces output order

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Ralf,

According to Ralf Wildenhues on 3/21/2008 8:45 AM:

|> Hmm.  --trace=MACRO is documented in autoconf/autom4te --help, but not
|> - --trace=MACRO[:FORMAT].  Should we document that in more than the
|> manual?
|
| Adding [:FORMAT] can't hurt, sure.

How does this look?

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkfpttMACgkQ84KuGfSFAYALYgCfdyMdaFgjBI93kPYwszY2ytle
jdAAoNDpwQN2dnmaslEJ+IM17TlrnV1O
=q46Z
-----END PGP SIGNATURE-----

>From 17a0c1fc32bd7820a4b4c9b69f2e7c4bfb47e29f Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 25 Mar 2008 20:34:43 -0600
Subject: [PATCH] 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 <address@hidden>
---
 ChangeLog       |    6 ++++++
 bin/autoconf.as |    9 +++++----
 bin/autom4te.in |   19 ++++++++++++++++---
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e1cf74..cd06546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-26  Eric Blake  <address@hidden>
+
+       Document --trace=macro:format in --help output.
+       * bin/autom4te.in (help): Mention optional trace format.
+       * bin/autoconf.as (usage): Likewise.
+
 2008-03-21  Eric Blake  <address@hidden>
 
        * GNUmakefile: Resynchronize with gnulib.
diff --git a/bin/autoconf.as b/bin/autoconf.as
index dbabc30..9e63aaa 100644
--- 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 <address@hidden>."]
 
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 8efe537..8110df1 100644
--- 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 blank for the default (comma for \@ and *, colon for %),
+a single character, or {STRING} to use a string.
+
 Report bugs to <address@hidden>.
 ";
 
-- 
1.5.4