[SCM] GNU Autoconf source repository branch, master, updated. v2.69-183-g968215e

[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=968215e7b4ea65e32ca7eda8fc5b211b4cec61d0

The branch, master has been updated
       via  968215e7b4ea65e32ca7eda8fc5b211b4cec61d0 (commit)
      from  a6b2acf29d66a1824572c27c2104d24a2b034790 (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 968215e7b4ea65e32ca7eda8fc5b211b4cec61d0
Author: Eric Blake <address@hidden>
Date:   Thu Dec 22 17:16:08 2016 -0600

    doc: Mention effect of 'autoreconf -fi' on INSTALL
    
    Several projects have a bootstrap script that invokes
    'autoreconf -fi' as part of a fresh version control checkout,
    in order to avoid storing common files in version control,
    while also allowing contributors to rerun bootstrap to pick
    up the benefits of any upgrade of one of the autotools.
    
    However, the documentation did not make it obvious that such
    a setup will overwrite any customizations to files like
    INSTALL, if those files are stored in version control, when
    automake still considers that file to be standard based on
    AM_INIT_AUTOMAKE settings.  In such a case, a mere
    'autoreconf -i' is good for the bootstrap script, while a
    separate 'autoreconf -f' is good for picking up on an upgrade
    of any autotools.
    
    * bin/autoreconf.in (help): Mention standard files.
    * doc/autoconf.texi (autoreconf Invocation): Add more text, including
    warning that mixing --force and --install may undo customizations,
    and that the set of files impacted is controlled by automake.
    Reported by Emil Laine <address@hidden>
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 bin/autoreconf.in |    4 ++--
 doc/autoconf.texi |   17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index da5b3ea..b401d01 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -69,8 +69,8 @@ Operation modes:
   -V, --version            print version number, then exit
   -v, --verbose            verbosely report processing
   -d, --debug              don't remove temporary files
-  -f, --force              consider all files obsolete
-  -i, --install            copy missing auxiliary files
+  -f, --force              consider all generated and standard files obsolete
+  -i, --install            copy missing standard auxiliary files
       --no-recursive       don't rebuild sub-packages
   -s, --symlink            with -i, install symbolic links instead of copies
   -m, --make               when applicable, re-run ./configure && make
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 01a8313..9cc0e98 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1739,14 +1739,21 @@ Don't remove the temporary files.
 
 @item --force
 @itemx -f
-Remake even @file{configure} scripts and configuration headers that are
-newer than their input files (@file{configure.ac} and, if present,
address@hidden).
+Consider all generated and standard auxiliary files to be obsolete.
+This remakes even @file{configure} scripts and configuration headers
+that are newer than their input files (@file{configure.ac} and, if
+present, @file{aclocal.m4}).
+
+If deemed appropriate, this option triggers calls to @samp{automake
+--force-missing}.  Passing both @option{--force} and @option{--install}
+to @command{autoreconf} will in turn undo any customizations to standard
+files.  Note that the macro @code{AM_INIT_AUTOMAKE} has some options
+which change the set of files considered to be standard.
 
 @item --install
 @itemx -i
-Install the missing auxiliary files in the package.  By default, files
-are copied; this can be changed with @option{--symlink}.
+Install any missing standard auxiliary files in the package.  By
+default, files are copied; this can be changed with @option{--symlink}.
 
 If deemed appropriate, this option triggers calls to
 @samp{automake --add-missing},


hooks/post-receive
-- 
GNU Autoconf source repository