[SCM] GNU Autoconf source repository branch, master, updated. v2.62-93-gf4df9b9

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=f4df9b9b40517e5c23845a61837d6d0fcbe49081

The branch, master has been updated
       via  f4df9b9b40517e5c23845a61837d6d0fcbe49081 (commit)
       via  d2dd4ed1caafae99076fc549b2e7fbe706e42d4e (commit)
      from  5391c02b40f89b33fb7e1b309cb61986281a0161 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f4df9b9b40517e5c23845a61837d6d0fcbe49081
Author: Eric Blake <address@hidden>
Date:   Tue Aug 26 09:28:15 2008 -0600

    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 <address@hidden>

commit d2dd4ed1caafae99076fc549b2e7fbe706e42d4e
Author: Eric Blake <address@hidden>
Date:   Tue Aug 26 09:07:01 2008 -0600

    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
    file if current M4 does not support it.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |   25 +++++++++++++++++++++++++
 bin/autoconf.as        |    6 +++---
 bin/autoheader.in      |    2 +-
 bin/autom4te.in        |   36 ++++++++++++------------------------
 bin/autoreconf.in      |    2 +-
 bin/autoscan.in        |    2 +-
 bin/autoupdate.in      |    4 ++--
 bin/ifnames.in         |    2 +-
 doc/autoconf.texi      |   12 +++++++++++-
 doc/install.texi       |   25 ++++++++++++++++++++++++-
 lib/autoconf/status.m4 |    9 +++++----
 11 files changed, 86 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51812e2..da4e2a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2008-08-26  Eric Blake  <address@hidden>
+
+       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
+       file if current M4 does not support it.
+
 2008-08-25  Eric Blake  <address@hidden>
 
        Adjust to recent m4 1.6 change to support m4_debugmode(d).
diff --git a/bin/autoconf.as b/bin/autoconf.as
index 5540002..3a25322 100644
--- 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 0df6fbb..ab5bfce 100644
--- 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 685df41..50c410c 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -111,29 +111,8 @@ map { s/:.*//;s/\W// } @m4_builtin;
 # Some macros don't follow this scheme: be sure to properly map to their
 # alternate name too.
 #
-# This is because GNU M4 1.4's tracing of builtins is buggy.  When run on
-# this input:
-#
-# | divert(-1)
-# | changequote([, ])
-# | define([m4_eval], defn([eval]))
-# | eval(1)
-# | m4_eval(2)
-# | undefine([eval])
-# | m4_eval(3)
-#
-# it behaves this way:
-#
-# | % m4 input.m4 -da -t eval
-# | m4trace: -1- eval(1)
-# | m4trace: -1- m4_eval(2)
-# | m4trace: -1- m4_eval(3)
-# | %
-#
-# Conversely:
-#
-# | % m4 input.m4 -da -t m4_eval
-# | %
+# FIXME: Trace status of renamed builtins was fixed in M4 1.4.5, which
+# we now depend on; do we still need to do this mapping?
 #
 # So we will merge them, i.e., tracing `BUILTIN' or tracing
 # `m4_BUILTIN' will be the same: tracing both, but honoring the
@@ -156,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.
@@ -245,6 +224,8 @@ EOF
 # ------------------------
 # Transform Autom4te conventions (e.g., using foo.m4f to designate a frozen
 # file) into a suitable command line for M4 (e.g., using --reload-state).
+# parse_args guarantees that we will see at most one frozen file, and that
+# if a frozen file is present, it is the first argument.
 sub files_to_options (@)
 {
   my (@file) = @_;
@@ -255,6 +236,12 @@ sub files_to_options (@)
       if ($file =~ /\.m4f$/)
        {
          $arg = "--reload-state=$arg";
+         # If the user downgraded M4 from 1.6 to 1.4.x after freezing
+         # the file, then we ensure the frozen __m4_version__ will
+         # not cause m4_init to make the wrong decision about the
+         # current M4 version.
+         $arg .= " --undefine=__m4_version__"
+           unless grep {/__m4_version__/} @m4_builtin;
        }
       push @res, $arg;
     }
@@ -416,6 +403,7 @@ Try `$me --help' for more information."
     }
 
   # Work around the M4 builtins tracing problem for @PRESELECT.
+  # FIXME: Is this still needed, now that we rely on M4 1.4.5?
   push (@preselect,
        map { $m4_builtin_alternate_name{$_} }
        grep { exists $m4_builtin_alternate_name{$_} } @preselect);
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 8b067fe..923f8ca 100644
--- 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 83fa6fc..18d9ac1 100644
--- 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 644de19..d23048a 100644
--- 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 6edc785..5ee70d7 100644
--- 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 75c110e..b996356 100644
--- 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.
 
address@hidden --debug
address@hidden -d
+Don't remove temporary files.
+
 @item address@hidden
 @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
address@hidden -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
address@hidden -f
address@hidden -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.
+
address@hidden address@hidden
address@hidden -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 070291c..f6620ec 100644
--- 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.
+
address@hidden --help=short
address@hidden --help=recursive
+Print a summary of the options unique to this package's
address@hidden, 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 address@hidden
 Look for the package's source code in directory @var{dir}.  Usually
 @command{configure} can determine that directory automatically.
+
address@hidden address@hidden
+Use @var{dir} as the installation prefix.  @ref{Installation Names}
+for more details, including other options available for fine-tuning
+the installation locations.
+
address@hidden --no-create
address@hidden -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.
+
address@hidden Local Variables:
address@hidden fill-column: 72
address@hidden ispell-local-dictionary: "american"
address@hidden indent-tabs-mode: nil
address@hidden whitespace-check-buffer-indent: nil
address@hidden End:
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index d9729a3..ddc5f47 100644
--- 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
 


hooks/post-receive
--
GNU Autoconf source repository