Update invocation documentation.

* doc/autoconf.texi (autoscan Invocation): Mention --debug.
(autoreconf Invocation): Mention -v.
(autom4te Invocation): Tie --freeze to -F, not -f.
(autoupdate Invocation): Mention --prepend-include.
* doc/install.texi (configure Invocation): Mention --help=short,
--help=recursive, -n/--no-create, --prefix.  Avoid TABs.
* bin/autoscan.in ($help): Omit space before `...'.
* bin/ifnames.in ($help): Likewise.
* bin/autoconf.as (Usage): Likewise.
* bin/autoreconf.in ($help): Likewise.
* bin/autoheader.in ($help): Likewise.
* bin/autom4te.in ($help): Likewise.
* bin/autoupdate.in ($help): Likewise.
* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Use
`[OPTION]...', rather than `[OPTIONS]'.  Mention --silent.  Indent
--file correctly.

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

diff --git a/ChangeLog b/ChangeLog
index e39b20221999d616c42fa87f1cde5b9784e89c4d..da4e2a290f91d5777c8eb2f39eea3799374017ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2008-08-26  Eric Blake  <ebb9@byu.net>
 
+       Update invocation documentation.
+       * doc/autoconf.texi (autoscan Invocation): Mention --debug.
+       (autoreconf Invocation): Mention -v.
+       (autom4te Invocation): Tie --freeze to -F, not -f.
+       (autoupdate Invocation): Mention --prepend-include.
+       * doc/install.texi (configure Invocation): Mention --help=short,
+       --help=recursive, -n/--no-create, --prefix.  Avoid TABs.
+       * bin/autoscan.in ($help): Omit space before `...'.
+       * bin/ifnames.in ($help): Likewise.
+       * bin/autoconf.as (Usage): Likewise.
+       * bin/autoreconf.in ($help): Likewise.
+       * bin/autoheader.in ($help): Likewise.
+       * bin/autom4te.in ($help): Likewise.
+       * bin/autoupdate.in ($help): Likewise.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Use
+       `[OPTION]...', rather than `[OPTIONS]'.  Mention --silent.  Indent
+       --file correctly.
+
        Don't let frozen __m4_version__ break downgrade to m4 1.4.x.
        * bin/autom4te.in: Adjust comments, now that we rely on 1.4.5+.
        (files_to_options): Avoid inheriting __m4_version__ from frozen

diff --git a/bin/autoconf.as b/bin/autoconf.as
index 5540002662eefcef37a14671d83b3e3bdb81e223..3a2532246d880c444a8858016166c64ae44efc47 100644 (file)
--- a/bin/autoconf.as
+++ b/bin/autoconf.as
@@ -24,7 +24,7 @@ m4_divert_push([HEADER-COPYRIGHT])dnl
 m4_divert_pop([HEADER-COPYRIGHT])dnl back to BODY
 
 usage=["\
-Usage: $0 [OPTION] ... [TEMPLATE-FILE]
+Usage: $0 [OPTION]... [TEMPLATE-FILE]
 
 Generate a configuration script from a TEMPLATE-FILE if given, or
 \`configure.ac' if present, or else \`configure.in'.  Output is sent
@@ -112,7 +112,7 @@ while test $# -gt 0 ; do
     --prepend-include=* | -B?* | \
     --warnings=* | -W?* )
        case $1 in
-         *\'*) arg=`AS_ECHO(["$1"]) | sed "s/'/'\\\\\\\\''/g"` ;;
+        *\'*) arg=`AS_ECHO(["$1"]) | sed "s/'/'\\\\\\\\''/g"` ;;
         *) arg=$1 ;;
        esac
        autom4te_options="$autom4te_options '$arg'"; shift ;;
@@ -122,7 +122,7 @@ while test $# -gt 0 ; do
     --warnings | -W )
        test $# = 1 && eval "$exit_missing_arg"
        case $2 in
-         *\'*) arg=`AS_ECHO(["$2"]) | sed "s/'/'\\\\\\\\''/g"` ;;
+        *\'*) arg=`AS_ECHO(["$2"]) | sed "s/'/'\\\\\\\\''/g"` ;;
         *) arg=$2 ;;
        esac
        autom4te_options="$autom4te_options $option '$arg'"

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 0df6fbbbc68e085c6f89f40d9ed37be7c334ae6b..ab5bfcecb0d1ef2d974ba35885493a6535513787 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -61,7 +61,7 @@ my @include;
 
 # $HELP
 # -----
-$help = "Usage: $0 [OPTION] ... [TEMPLATE-FILE]
+$help = "Usage: $0 [OPTION]... [TEMPLATE-FILE]
 
 Create a template file of C \`\#define\' statements for \`configure\' to
 use.  To this end, scan TEMPLATE-FILE, or \`configure.ac\' if present,

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 055abcedeb7c42ae4c7361dbeb717058497c3942..50c410cdcf26637ecc751360ca514df5b693b820 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -135,7 +135,7 @@ my %m4_builtin_alternate_name;
 
 # $HELP
 # -----
-$help = "Usage: $0 [OPTION] ... [FILES]
+$help = "Usage: $0 [OPTION]... [FILES]
 
 Run GNU M4 on the FILES, avoiding useless runs.  Output the traces if tracing,
 the frozen file if freezing, otherwise the expansion of the FILES.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 8b067fee975c1571dd9ae5f4b09dc4f28772918d..923f8caf7a456150da60a070fd71cb32d76b287d 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -55,7 +55,7 @@ use strict;
 
 # $HELP
 # -----
-$help = "Usage: $0 [OPTION] ... [DIRECTORY] ...
+$help = "Usage: $0 [OPTION]... [DIRECTORY]...
 
 Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint'
 (formerly `gettextize'), and `libtoolize' where appropriate)

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 83fa6fcb1eb93eb3cb70bfbf9442ba6ab7df05b5..18d9ac1ae7852eae4cd695481b20c5b0ae9ac4e9 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -101,7 +101,7 @@ my @include = ('@datadir@');
 
 # $help
 # -----
-$help = "Usage: $0 [OPTION] ... [SRCDIR]
+$help = "Usage: $0 [OPTION]... [SRCDIR]
 
 Examine source files in the directory tree rooted at SRCDIR, or the
 current directory if none is given.  Search the source files for

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index 644de19c24b971705c00cd64f2a855ddd285c85c..d23048a1cc73c355a39e9de3db10f1381c43ded6 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -61,9 +61,9 @@ my $m4 = $ENV{"M4"} || '@M4@';
 
 # $HELP
 # -----
-$help = "Usage: $0 [OPTION] ...  [TEMPLATE-FILE...]
+$help = "Usage: $0 [OPTION]... [TEMPLATE-FILE]...
 
-Update the TEMPLATE-FILE... if given, or `configure.ac' if present,
+Update each TEMPLATE-FILE if given, or `configure.ac' if present,
 or else `configure.in', to the syntax of the current version of
 Autoconf.  The original files are backed up.
 

diff --git a/bin/ifnames.in b/bin/ifnames.in
index 6edc7857054c3912a7bb041633a6edf0c4659f11..5ee70d714f9d86a5eab37a631188414c80b574b4 100644 (file)
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -49,7 +49,7 @@ use Autom4te::FileUtils;
 
 # $HELP
 # -----
-$help = "Usage: $0 [OPTION] ...  [FILE] ...
+$help = "Usage: $0 [OPTION]... [FILE]...
 
 Scan all of the C source FILES (or the standard input, if none are
 given) and write to the standard output a sorted list of all the

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 75c110e559dc3515f1782ad1ea70c561617154c4..b996356942e0a0ba385e040329d7253c1607f1a3 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1335,6 +1335,10 @@ Print the version number of Autoconf and exit.
 Print the names of the files it examines and the potentially interesting
 symbols it finds in them.  This output can be voluminous.
 
+@item --debug
+@itemx -d
+Don't remove temporary files.
+
 @item --include=@var{dir}
 @itemx -I @var{dir}
 Append @var{dir} to the include path.  Multiple invocations accumulate.
@@ -1611,6 +1615,7 @@ Print a summary of the command line options and exit.
 Print the version number of Autoconf and exit.
 
 @item --verbose
+@itemx -V
 Print the name of each directory @command{autoreconf} examines and the
 commands it runs.  If given two or more times, pass @option{--verbose}
 to subordinate tools that support it.
@@ -9984,7 +9989,7 @@ m4 --reload-state=4.m4f input.m4
 @end example
 
 @item --freeze
-@itemx -f
+@itemx -F
 Produce a frozen state file.  @command{autom4te} freezing is stricter
 than M4's: it must produce no warnings, and no output other than empty
 lines (a line with white space is @emph{not} empty) and comments
@@ -18885,6 +18890,11 @@ Force the update even if the file has not changed.  Disregard the cache.
 @itemx -I @var{dir}
 Also look for input files in @var{dir}.  Multiple invocations accumulate.
 Directories are browsed from last to first.
+
+@item --prepend-include=@var{dir}
+@itemx -B @var{dir}
+Prepend directory @var{dir} to the search path.  This is used to include
+the language-specific files before any third-party macros.
 @end table
 
 @node Obsolete Macros

diff --git a/doc/install.texi b/doc/install.texi
index 070291cf438ac47c68c38335f6b7a2c61c6e3236..f6620ec37344598aa6e98418db79bd26283be5c6 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -294,7 +294,14 @@ operates.
 @table @option
 @item --help
 @itemx -h
-Print a summary of the options to @command{configure}, and exit.
+Print a summary of all of the options to @command{configure}, and exit.
+
+@item --help=short
+@itemx --help=recursive
+Print a summary of the options unique to this package's
+@command{configure}, and exit.  The @code{short} variant lists options
+used only in the top level, while the @code{recursive} variant lists
+options also present in any nested packages.
 
 @item --version
 @itemx -V
@@ -321,8 +328,24 @@ will still be shown).
 @item --srcdir=@var{dir}
 Look for the package's source code in directory @var{dir}.  Usually
 @command{configure} can determine that directory automatically.
+
+@item --prefix=@var{dir}
+Use @var{dir} as the installation prefix.  @ref{Installation Names}
+for more details, including other options available for fine-tuning
+the installation locations.
+
+@item --no-create
+@itemx -n
+Run the configure checks, but stop before creating any output files.
 @end table
 
 @noindent
 @command{configure} also accepts some other, not widely useful, options.
 Run @samp{configure --help} for more details.
+
+@c Local Variables:
+@c fill-column: 72
+@c ispell-local-dictionary: "american"
+@c indent-tabs-mode: nil
+@c whitespace-check-buffer-indent: nil
+@c End:

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index d9729a3a495f5de845f65fddb07d2cb89ad587ba..ddc5f47fb3c54774116ad46fee67b805afb57a61 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1392,19 +1392,20 @@ ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $[0] [[OPTIONS]] [[FILE]]...
+Usage: $[0] [[OPTION]]... [[FILE]]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+[]                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
 m4_ifdef([_AC_SEEN_CONFIG(FILES)],
-  [AS_HELP_STRING([[--file=FILE[:TEMPLATE]]],
+  [AS_HELP_STRING([[    --file=FILE[:TEMPLATE]]],
     [instantiate the configuration file FILE], [                   ])
 ])dnl
 m4_ifdef([_AC_SEEN_CONFIG(HEADERS)],
-  [AS_HELP_STRING([[--header=FILE[:TEMPLATE]]],
+  [AS_HELP_STRING([[    --header=FILE[:TEMPLATE]]],
     [instantiate the configuration header FILE], [                   ])
 ])dnl