From MAILER-DAEMON Wed Dec 14 13:29:16 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cHEIm-0004XK-9j
	for mharc-autoconf-commit@gnu.org; Wed, 14 Dec 2016 13:29:16 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54701)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cHEIj-0004Qc-UT
	for autoconf-commit@gnu.org; Wed, 14 Dec 2016 13:29:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cHEIf-0007JA-Ro
	for autoconf-commit@gnu.org; Wed, 14 Dec 2016 13:29:13 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:33411)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cHEIf-0007J4-OJ
	for autoconf-commit@gnu.org; Wed, 14 Dec 2016 13:29:09 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 7EE552201BB; Wed, 14 Dec 2016 18:29:09 +0000 (UTC)
From: "Paul Eggert" <eggert@cs.ucla.edu>
To: autoconf-commit@gnu.org
Subject: [SCM] GNU Autoconf source repository branch, master,
	updated. v2.69-172-geea950a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 527f183f232e14ebf0ef2b8a086d675e78700af2
X-Git-Newrev: eea950a012e8725da53e0444a43d508d0b645d8f
Message-Id: <20161214182909.7EE552201BB@vcs.savannah.gnu.org>
Date: Wed, 14 Dec 2016 18:29:09 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: autoconf-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: Commits to the Autoconf git repository <autoconf-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/autoconf-commit/>
List-Post: <mailto:autoconf-commit@gnu.org>
List-Help: <mailto:autoconf-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Dec 2016 18:29:15 -0000

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=eea950a012e8725da53e0444a43d508d0b645d8f

The branch, master has been updated
       via  eea950a012e8725da53e0444a43d508d0b645d8f (commit)
      from  527f183f232e14ebf0ef2b8a086d675e78700af2 (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 eea950a012e8725da53e0444a43d508d0b645d8f
Author: Bruno Haible <bruno@clisp.org>
Date:   Wed Dec 14 10:28:46 2016 -0800

    * doc/autoconf.texi (Using Autotest): Stop mentioning Free Recode.
    
    Free Wdiff is now GNU Wdiff again.

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

Summary of changes:
 doc/autoconf.texi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 00ca345..7e710a5 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -24893,7 +24893,7 @@ diminish the interaction with bug reporters, and simple timing reports.
 Autoconf itself has been using Autotest for years, and we do attest that
 it has considerably improved the strength of the test suite and the
 quality of bug reports.  Other projects are known to use some generation
-of Autotest, such as Bison, Free Recode, Free Wdiff, GNU Tar, each of
+of Autotest, such as Bison, GNU Wdiff, GNU Tar, each of
 them with different needs, and this usage has validated Autotest as a general
 testing framework.
 


hooks/post-receive
-- 
GNU Autoconf source repository


From MAILER-DAEMON Wed Dec 21 09:33:16 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cJhxE-0004UF-CK
	for mharc-autoconf-commit@gnu.org; Wed, 21 Dec 2016 09:33:16 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53131)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cJhx6-0004Tu-2T
	for autoconf-commit@gnu.org; Wed, 21 Dec 2016 09:33:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cJhx3-0005Oy-P5
	for autoconf-commit@gnu.org; Wed, 21 Dec 2016 09:33:08 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:38538)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cJhx3-0005Os-Lc
	for autoconf-commit@gnu.org; Wed, 21 Dec 2016 09:33:05 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id 676412201BA; Wed, 21 Dec 2016 14:33:05 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: autoconf-commit@gnu.org
Subject: [SCM] GNU Autoconf source repository branch, master,
	updated. v2.69-180-g0e2eece
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: eea950a012e8725da53e0444a43d508d0b645d8f
X-Git-Newrev: 0e2eecedb12dd472c9a008748be6edd6ea68fa0e
Message-Id: <20161221143305.676412201BA@vcs.savannah.gnu.org>
Date: Wed, 21 Dec 2016 14:33:05 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: autoconf-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: Commits to the Autoconf git repository <autoconf-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/autoconf-commit/>
List-Post: <mailto:autoconf-commit@gnu.org>
List-Help: <mailto:autoconf-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2016 14:33:14 -0000

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=0e2eecedb12dd472c9a008748be6edd6ea68fa0e

The branch, master has been updated
       via  0e2eecedb12dd472c9a008748be6edd6ea68fa0e (commit)
       via  c54beb85aa855ce2c817d4f7738748841bf6ad30 (commit)
       via  0848232967ea70448d3767f22ff2f7d359e67580 (commit)
       via  d068c0a5ac8ef095fe39b17fefe576b17fc3ab4a (commit)
       via  76183791a41bf8777cbce94e1b899529dc98e124 (commit)
       via  73770787510fc18ec3dde2ccf3281977ea6b750b (commit)
       via  501ccbbfdb43561537f377a2ac66cf89f975b1b1 (commit)
       via  4523f7c32b052e805c4081fa6a55c7414d94d791 (commit)
      from  eea950a012e8725da53e0444a43d508d0b645d8f (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 0e2eecedb12dd472c9a008748be6edd6ea68fa0e
Author: Paolo Bonzini <bonzini@gnu.org>
Date:   Mon Oct 31 18:08:07 2016 +0100

    autoconf: prefer an unrolled loop for trivial AC_CHECK_HEADERS
    
    An unrolled loop avoids the cost of spawning sed in AS_TR_SH and
    AS_TR_CPP.  Prefer it if there is nothing in the second and third
    argument of AC_CHECK_HEADERS and the first argument is a literal.
    
    * lib/autoconf/headers.m4 (AC_CHECK_HEADERS): Unroll loop if safe.
    (_AC_CHECK_HEADERS): Move basic implementation here.
    (AC_CHECK_INCLUDES_DEFAULT): Remove unnecessary arguments after the first.
    
    Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
    Message-Id: <1477933688-4884-3-git-send-email-bonzini@gnu.org>
    [eblake: perform AC_CHECK_HEADERS_ONCE changes separately, use
    dnl to reduce generated blank lines]
    Signed-off-by: Eric Blake <eblake@redhat.com>
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit c54beb85aa855ce2c817d4f7738748841bf6ad30
Author: Paolo Bonzini <bonzini@gnu.org>
Date:   Thu Nov 3 20:08:28 2016 -0500

    autoconf: prefer an unrolled loop for trivial AC_CHECK_FUNCS
    
    An unrolled loop avoids the cost of spawning sed in AS_TR_SH and
    AS_TR_CPP.  Prefer it if there is nothing in the second and third
    argument of AC_CHECK_FUNCS and the first argument is a literal.
    
    * lib/autoconf/functions.m4 (AC_CHECK_FUNCS): Unroll loop if safe.
    (_AC_CHECK_FUNCS): Move basic implementation here.
    
    Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
    Message-Id: <1477933688-4884-2-git-send-email-bonzini@gnu.org>
    [eblake: perform AC_CHECK_FUNCS_ONCE changes separately, use
    dnl to reduce generated blank lines]
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit 0848232967ea70448d3767f22ff2f7d359e67580
Author: Eric Blake <eblake@redhat.com>
Date:   Wed Dec 21 08:32:43 2016 -0600

    AC_CHECK_HEADERS_ONCE: hoist cache name computation to m4 time
    
    Rather than perform a sed script on each element of the
    $ac_header_c_list to compute the corresponding cache name, we
    can inline enough of AC_CHECK_HEADER to bypass the normal
    polymorphic code, and instead directly use the literal
    header and cache name that we are consuming from the list.
    
    The resulting configure script is roughly unchanged in size,
    but performs slightly faster.
    
    * lib/autoconf/headers.m4 (AC_CHECK_HEADER_COMPILE): Split out shell
    function registration...
    (_AC_CHECK_HEADER_COMPILE_FN): ...to here.
    (_AC_HEADERS_EXPANSION): Use it to inline enough of AC_CHECK_HEADER
    to operate on a literal rather than a shell variable, for fewer sed
    calls.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit d068c0a5ac8ef095fe39b17fefe576b17fc3ab4a
Author: Eric Blake <eblake@redhat.com>
Date:   Thu Nov 3 20:03:06 2016 -0500

    AC_CHECK_FUNCS_ONCE: hoist cache name computation to m4 time
    
    Rather than perform a sed script on each element of the
    $ac_func_c_list to compute the corresponding cache name, we
    can inline enough of AC_CHECK_FUNC to bypass the normal
    polymorphic code, and instead directly use the literal
    function name that we are consuming from the list.
    
    While at it, we can use echo instead of cat to append to
    confdefs.h, for another process shaved.
    
    The resulting configure script is roughly unchanged in size,
    but performs slightly faster.
    
    * lib/autoconf/functions.m4 (AC_CHECK_FUNC): Split out shell
    function registration...
    (_AC_CHECK_FUNC_FN): ...to here.
    (_AC_FUNCS_EXPANSION): Use it to inline enough of AC_CHECK_FUNC to
    operate on a literal rather than a shell variable, for fewer sed
    calls.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit 76183791a41bf8777cbce94e1b899529dc98e124
Author: Eric Blake <eblake@redhat.com>
Date:   Wed Dec 21 08:32:39 2016 -0600

    AC_CHECK_HEADERS_ONCE: hoist CPP name computation to m4 time
    
    Rather than perform a sed script on each element of the
    $ac_header_c_list to compute the corresponding CPP name, we can
    make the list store a series of triples of header names, shell-safe
    names, and CPP names all computed at m4 time.
    
    The resulting configure script is slightly larger based on
    how many headers are checked once, but also performs
    slightly faster.
    
    There is still a sed call in AC_CHECK_HEADER for computing the
    cache variable name; that will be dealt with next.  That patch
    will also be the one that takes advantage of the shell-safe name.
    
    * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_ONCE): Track the shell
    and CPP name in the list...
    (_AC_HEADERS_EXPANSION): ...and rewrite the list walk to parse off
    triples of arguments, for fewer sed calls.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit 73770787510fc18ec3dde2ccf3281977ea6b750b
Author: Eric Blake <eblake@redhat.com>
Date:   Thu Nov 3 20:03:06 2016 -0500

    AC_CHECK_FUNCS_ONCE: hoist CPP name computation to m4 time
    
    Rather than perform a sed script on each element of the
    $ac_func_c_list to compute the corresponding CPP name, we can
    make the list store a series of pairs of function names and
    CPP names all computed at m4 time.
    
    The resulting configure script is slightly larger based on
    how many function names are checked once, but also performs
    slightly faster.
    
    There is still a sed call in AC_CHECK_FUNC for computing the
    cache variable name; that will be dealt with next.
    
    * lib/autoconf/functions.m4 (_AC_CHECK_FUNC_ONCE): Track the CPP
    name in the list...
    (_AC_FUNCS_EXPANSION): ...and rewrite the list walk to parse off
    pairs of arguments, for fewer sed calls.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit 501ccbbfdb43561537f377a2ac66cf89f975b1b1
Author: Eric Blake <eblake@redhat.com>
Date:   Wed Dec 21 08:32:29 2016 -0600

    AC_CHECK_HEADERS_ONCE: honor current AC_LANG
    
    Previously, AC_CHECK_HEADERS_ONCE collected a list of header names
    to check, but ran the checks using the AC_LANG that was active
    during the first encounter of the macro.  In practice, this is
    usually the C language, and we haven't had actual reports of projects
    attempting to use AC_CHECK_HEADERS_ONCE across multiple languages,
    rather this was discovered by code inspection.
    
    With this patch, the code now tracks a separate per-language list of
    names to check.  Note, however, that it is only possible to check for
    a given header name in one language; attempting to add a name again
    under AC_CHECK_HEADERS_ONCE while a different language is active is a
    no-op (this still makes sense because the side-effect of defining
    the CPP macro HAVE_HEADER does not include a language prefix).
    
    * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_ONCE)
    (_AC_HEADERS_EXPANSION):
    * NEWS: Mention it.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit 4523f7c32b052e805c4081fa6a55c7414d94d791
Author: Eric Blake <eblake@redhat.com>
Date:   Thu Nov 3 10:28:07 2016 -0500

    AC_CHECK_FUNCS_ONCE: honor current AC_LANG
    
    Previously, AC_CHECK_FUNCS_ONCE collected a list of function names
    to check, but ran the checks using the AC_LANG that was active
    during the first encounter of the macro.  In practice, this is
    usually the C language, and we haven't had actual reports of projects
    attempting to use AC_CHECK_FUNCS_ONCE across multiple languages,
    rather this was discovered by code inspection.
    
    With this patch, the code now tracks a separate per-language list of
    names to check.  Note, however, that it is only possible to check for
    a given function name in one language; attempting to add a name again
    under AC_CHECK_FUNCS_ONCE while a different language is active is a
    no-op (this still makes sense because the side-effect of defining
    the CPP macro HAVE_FUNC does not include a language prefix).
    
    * lib/autoconf/functions.m4 (_AC_CHECK_FUNC_ONCE)
    (_AC_FUNCS_EXPANSION):
    * NEWS: Mention it.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 NEWS                      |    4 +++
 lib/autoconf/functions.m4 |   60 +++++++++++++++++++++++++++------------
 lib/autoconf/headers.m4   |   68 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 95 insertions(+), 37 deletions(-)

diff --git a/NEWS b/NEWS
index a4c53dd..b82c1e3 100644
--- a/NEWS
+++ b/NEWS
@@ -111,6 +111,10 @@ GNU Autoconf NEWS - User visible changes.
   useful effect is to trigger those checks, with this macro.  It is
   unlikely to be useful otherwise.
 
+- The AC_CHECK_FUNCS_ONCE and AC_CHECK_HEADERS_ONCE macros now support
+  use with multiple languages, rather than forcing all checks in the
+  language used by the first encounter of the macro.
+
 ** Man pages for config.guess and config.sub are no longer provided.
 They were moved to the master source tree for config.guess and config.sub.
 
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 66abe29..a227cd4 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -51,17 +51,20 @@ m4_define([_AC_CHECK_FUNC_BODY],
 ])# _AC_CHECK_FUNC_BODY
 
 
+m4_define([_AC_CHECK_FUNC_FN],
+[AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_func],
+  [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_func],
+    [LINENO FUNC VAR],
+    [Tests whether FUNC exists, setting the cache variable VAR accordingly])],
+  [_AC_CHECK_FUNC_BODY])])
+
 # AC_CHECK_FUNC(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # -----------------------------------------------------------------
 # Check whether FUNCTION links in the current language.  Set the cache
 # variable ac_cv_func_FUNCTION accordingly, then execute
 # ACTION-IF-FOUND or ACTION-IF-NOT-FOUND.
 AC_DEFUN([AC_CHECK_FUNC],
-[AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_func],
-  [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_func],
-    [LINENO FUNC VAR],
-    [Tests whether FUNC exists, setting the cache variable VAR accordingly])],
-  [_$0_BODY])]dnl
+[_AC_CHECK_FUNC_FN()]dnl
 [AS_VAR_PUSHDEF([ac_var], [ac_cv_func_$1])]dnl
 [ac_fn_[]_AC_LANG_ABBREV[]_check_func "$LINENO" "$1" "ac_var"
 AS_VAR_IF([ac_var], [yes], [$2], [$3])
@@ -85,20 +88,26 @@ m4_define([_AH_CHECK_FUNC],
 # `break' to stop the search.
 AC_DEFUN([AC_CHECK_FUNCS],
 [m4_map_args_w([$1], [_AH_CHECK_FUNC(], [)])]dnl
-[AS_FOR([AC_func], [ac_func], [$1],
-[AC_CHECK_FUNC(AC_func,
-	       [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]AC_func)) $2],
-	       [$3])dnl])
+[m4_if([$2$3]AS_LITERAL_IF([$1], [[yes]], [[no]]), [yes],
+       [m4_map_args_w([$1], [_$0(], [)])],
+       [AS_FOR([AC_func], [ac_func], [$1], [_$0(AC_func, [$2], [$3])])])dnl
 ])# AC_CHECK_FUNCS
 
+m4_define([_AC_CHECK_FUNCS],
+[AC_CHECK_FUNC([$1],
+	       [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]$1)) $2],
+	       [$3])dnl
+])
+
 
 # _AC_CHECK_FUNC_ONCE(FUNCTION)
 # -----------------------------
 # Check for a single FUNCTION once.
 m4_define([_AC_CHECK_FUNC_ONCE],
-[_AH_CHECK_FUNC([$1])AC_DEFUN([_AC_Func_$1],
-  [m4_divert_text([INIT_PREPARE], [AS_VAR_APPEND([ac_func_list], [" $1"])])
-_AC_FUNCS_EXPANSION])AC_REQUIRE([_AC_Func_$1])])
+[_AH_CHECK_FUNC([$1])AC_DEFUN([_AC_Func_$1], [m4_divert_text([INIT_PREPARE],
+  [AS_VAR_APPEND([ac_func_]]_AC_LANG_ABBREV[[_list],
+  [" $1 ]AS_TR_CPP([HAVE_$1])["])])]dnl
+[_AC_FUNCS_EXPANSION(_AC_LANG_ABBREV)])AC_REQUIRE([_AC_Func_$1])])
 
 # AC_CHECK_FUNCS_ONCE(FUNCTION...)
 # --------------------------------
@@ -107,12 +116,29 @@ _AC_FUNCS_EXPANSION])AC_REQUIRE([_AC_Func_$1])])
 AC_DEFUN([AC_CHECK_FUNCS_ONCE],
 [m4_map_args_w([$1], [_AC_CHECK_FUNC_ONCE(], [)])])
 
+# _AC_FUNCS_EXPANSION(LANG)
+# -------------------------
+# One-shot code per language LANG for checking all functions registered by
+# AC_CHECK_FUNCS_ONCE while that language was active.  We have to inline
+# portions of AC_CHECK_FUNC, because although we operate on shell
+# variables, we know they represent literals at that point in time,
+# where we don't want to trigger normal AS_VAR_PUSHDEF shell code.
 m4_define([_AC_FUNCS_EXPANSION],
-[
-  m4_divert_text([DEFAULTS], [ac_func_list=])
-  AC_CHECK_FUNCS([$ac_func_list])
-  m4_define([_AC_FUNCS_EXPANSION], [])
-])
+[m4_ifndef([$0($1)], [m4_define([$0($1)])m4_divert_text([DEFAULTS],
+[ac_func_$1_list=])ac_func=
+for ac_item in $ac_func_$1_list
+do
+  if test $ac_func; then
+    _AC_CHECK_FUNC_FN()ac_fn_$1_check_func "$LINENO" ]dnl
+[$ac_func ac_cv_func_$ac_func
+    if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then
+      echo "[#]define $ac_item 1" >> confdefs.h
+    fi
+    ac_func=
+  else
+    ac_func=$ac_item
+  fi
+done])])
 
 
 # _AC_REPLACE_FUNC(FUNCTION)
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index 72262c1..8e2dbb0 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -73,18 +73,21 @@ m4_define([_AC_CHECK_HEADER_COMPILE_BODY],
 ])# _AC_CHECK_HEADER_COMPILE_BODY
 
 
+m4_define([_AC_CHECK_HEADER_COMPILE_FN],
+[AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_header_compile],
+  [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_header_compile],
+    [LINENO HEADER VAR INCLUDES],
+    [Tests whether HEADER exists and can be compiled using the include files
+     in INCLUDES, setting the cache variable VAR accordingly.])],
+  [_AC_CHECK_HEADER_COMPILE_BODY])])
+
 # _AC_CHECK_HEADER_COMPILE(HEADER-FILE,
 #		       [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
 #		       [INCLUDES = DEFAULT-INCLUDES])
 # --------------------------------------------------------------
 # Check the compiler accepts HEADER-FILE.  The INCLUDES are defaulted.
 AC_DEFUN([_AC_CHECK_HEADER_COMPILE],
-[AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_check_header_compile],
-  [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_check_header_compile],
-    [LINENO HEADER VAR INCLUDES],
-    [Tests whether HEADER exists and can be compiled using the include files
-     in INCLUDES, setting the cache variable VAR accordingly.])],
-  [$0_BODY])]dnl
+[_AC_CHECK_HEADER_COMPILE_FN()]dnl
 [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])]dnl
 [ac_fn_[]_AC_LANG_ABBREV[]_check_header_compile ]dnl
 ["$LINENO" "$1" "ac_Header" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
@@ -182,22 +185,28 @@ m4_define([AH_CHECK_HEADERS],
 # header.  Either ACTION may include `break' to stop the search.
 AC_DEFUN([AC_CHECK_HEADERS],
 [m4_map_args_w([$1], [_AH_CHECK_HEADER(], [)])]dnl
-[AS_FOR([AC_header], [ac_header], [$1],
-[AC_CHECK_HEADER(AC_header,
-		 [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]AC_header)) $2],
-		 [$3], [$4])dnl])
+[m4_if([$2$3]AS_LITERAL_IF([$1], [[yes]], [[no]]), [yes],
+       [m4_map_args_w([$1], [_$0(], [, [], [], [$4])])],
+       [AS_FOR([AC_header], [ac_header], [$1], [_$0(AC_header, [$2], [$3], [$4])])])dnl
 ])# AC_CHECK_HEADERS
 
+m4_define([_AC_CHECK_HEADERS],
+[AC_CHECK_HEADER([$1],
+		 [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]$1)) $2],
+		 [$3], [$4])dnl
+])
+
 
 # _AC_CHECK_HEADER_ONCE(HEADER-FILE)
 # ----------------------------------
 # Check for a single HEADER-FILE once.
 m4_define([_AC_CHECK_HEADER_ONCE],
 [_AH_CHECK_HEADER([$1])AC_DEFUN([_AC_Header_]m4_translit([[$1]],
-    [./-], [___]),
-  [m4_divert_text([INIT_PREPARE], [AS_VAR_APPEND([ac_header_list], [" $1"])])
-_AC_HEADERS_EXPANSION])AC_REQUIRE([_AC_Header_]m4_translit([[$1]],
-    [./-], [___]))])
+    [./-], [___]), [m4_divert_text([INIT_PREPARE],
+  [AS_VAR_APPEND([ac_header_]]_AC_LANG_ABBREV[[_list],
+  [" $1 ]AS_TR_SH([$1]) AS_TR_CPP([HAVE_$1])["])])]dnl
+[_AC_HEADERS_EXPANSION(_AC_LANG_ABBREV)])AC_REQUIRE(
+  [_AC_Header_]m4_translit([[$1]], [./-], [___]))])
 
 
 # AC_CHECK_HEADERS_ONCE(HEADER-FILE...)
@@ -213,11 +222,31 @@ AC_DEFUN([AC_CHECK_HEADERS_ONCE],
 AC_DEFUN([_AC_CHECK_HEADERS_ONCE],
   [m4_map_args_w([$1], [_AC_CHECK_HEADER_ONCE(], [)])])
 
+# _AC_HEADERS_EXPANSION(LANG)
+# ---------------------------
+# One-shot code per language LANG for checking all headers registered by
+# AC_CHECK_HEADERS_ONCE while that language was active.  We have to inline
+# portions of AC_CHECK_HEADER_COMPILE, because although we operate on shell
+# variables, we know they represent literals at that point in time,
+# where we don't want to trigger normal AS_VAR_PUSHDEF shell code.
 m4_define([_AC_HEADERS_EXPANSION],
-  [m4_divert_text([DEFAULTS], [ac_header_list=])]dnl
-  [AC_CHECK_HEADERS([$ac_header_list], [], [], [$ac_includes_default])]dnl
-  [m4_define([_AC_HEADERS_EXPANSION], [])])
-
+[m4_ifndef([$0($1)], [m4_define([$0($1)])m4_divert_text([DEFAULTS],
+[ac_header_$1_list=])ac_header= ac_cache=
+for ac_item in $ac_header_$1_list
+do
+  if test $ac_cache; then
+    _AC_CHECK_HEADER_COMPILE_FN()ac_fn_$1_check_header_compile "$LINENO" ]dnl
+[$ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "[#]define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done])])
 
 
 
@@ -261,8 +290,7 @@ ac_includes_default="\
 #endif"
 ])]dnl
 [_AC_CHECK_HEADERS_ONCE(
-  [sys/types.h sys/stat.h strings.h inttypes.h stdint.h unistd.h],
-  [], [], [$ac_includes_default])]dnl
+  [sys/types.h sys/stat.h strings.h inttypes.h stdint.h unistd.h])]dnl
 dnl For backward compatibility, provide unconditional AC_DEFINEs of
 dnl HAVE_STDLIB_H, HAVE_STRING_H, and STDC_HEADERS.
 [AC_DEFINE([HAVE_STDLIB_H], [1],


hooks/post-receive
-- 
GNU Autoconf source repository


From MAILER-DAEMON Wed Dec 21 11:47:31 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cJk39-0006ur-BX
	for mharc-autoconf-commit@gnu.org; Wed, 21 Dec 2016 11:47:31 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54369)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cJk34-0006nQ-BJ
	for autoconf-commit@gnu.org; Wed, 21 Dec 2016 11:47:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cJk30-0000cW-1w
	for autoconf-commit@gnu.org; Wed, 21 Dec 2016 11:47:26 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:39237)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cJk2z-0000cQ-UE
	for autoconf-commit@gnu.org; Wed, 21 Dec 2016 11:47:21 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id A87752201BA; Wed, 21 Dec 2016 16:47:21 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: autoconf-commit@gnu.org
Subject: [SCM] GNU Autoconf source repository branch, master,
	updated. v2.69-181-g78ad1b0
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0e2eecedb12dd472c9a008748be6edd6ea68fa0e
X-Git-Newrev: 78ad1b0b2cea606bf401ed0262540b503db73e1c
Message-Id: <20161221164721.A87752201BA@vcs.savannah.gnu.org>
Date: Wed, 21 Dec 2016 16:47:21 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: autoconf-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: Commits to the Autoconf git repository <autoconf-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/autoconf-commit/>
List-Post: <mailto:autoconf-commit@gnu.org>
List-Help: <mailto:autoconf-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2016 16:47:30 -0000

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=78ad1b0b2cea606bf401ed0262540b503db73e1c

The branch, master has been updated
       via  78ad1b0b2cea606bf401ed0262540b503db73e1c (commit)
      from  0e2eecedb12dd472c9a008748be6edd6ea68fa0e (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 78ad1b0b2cea606bf401ed0262540b503db73e1c
Author: Daniel Elstner <daniel.kitta@gmail.com>
Date:   Wed Dec 21 17:15:46 2016 +0100

    autoheader: check templates of all config headers
    
    * bin/autoheader.in: When checking for missing templates, take
    all config headers into account, not just the one generated by
    autoheader.  This makes it possible to use AC_DEFINE() for
    secondary headers without duplicating the template into the
    first header.
    * tests/tools.at: Add a check for autoheader with multiple
    config headers.
    * NEWS: Document the new behavior.
    Message-Id: <1482336946.31331.2.camel@gmail.com>
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 NEWS              |    5 +++++
 bin/autoheader.in |   37 ++++++++++++++++++++++++++-----------
 tests/tools.at    |   25 +++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index b82c1e3..a1f741f 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,11 @@ GNU Autoconf NEWS - User visible changes.
    is now deprecated.  If you really need that behavior use
    AC_PREPROC_IFELSE.
 
+** When checking for missing templates, autoheader now takes any
+   templates defined in the inputs of secondary config headers into
+   account.  This makes it possible to use AC_DEFINE for secondary
+   headers without duplicating the template in the main config header.
+
 ** Macros
 
 - New macro AC_C__GENERIC.
diff --git a/bin/autoheader.in b/bin/autoheader.in
index 528e22c..2d2f943 100644
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -191,11 +191,21 @@ unless ($config_h)
     exit 1;
   }
 
-# We template only the first CONFIG_HEADER.
-$config_h =~ s/ .*//;
 # Support "outfile[:infile]", defaulting infile="outfile.in".
-($config_h, $config_h_in) = split (':', $config_h, 2);
-$config_h_in ||= "$config_h.in";
+sub templates_for_header
+{
+  my ($spec) = @_;
+  my ($header, @templates) = split(':', $spec);
+
+  return @templates if @templates;
+  return $header . '.in';
+}
+
+my @config_templates = map(templates_for_header($_), split(' ', $config_h));
+
+# We template only the first CONFIG_HEADER.
+$config_h_in = shift(@config_templates);
+$config_h =~ s/[ :].*//;
 
 # %SYMBOL might contain things like 'F77_FUNC(name,NAME)', but we keep
 # only the name of the macro.
@@ -261,14 +271,20 @@ $out->close;
 
 # Check that all the symbols have a template.
 {
-  my $in = new Autom4te::XFile ("$tmp/config.hin", "<");
-  my $suggest_ac_define = 1;
-  while ($_ = $in->getline)
+  foreach my $template ("$tmp/config.hin", @config_templates)
     {
-      my ($symbol) = /^\#\s*\w+\s+(\w+)/
-	or next;
-      delete $symbol{$symbol};
+      my $in = new Autom4te::XFile ($template, "<");
+
+      while ($_ = $in->getline)
+	{
+	  my ($sym) = /^\#\s*\w+\s+(\w+)/
+	    or next;
+	  delete $symbol{$sym};
+	}
     }
+
+  my $suggest_ac_define = 1;
+
   foreach (sort keys %symbol)
     {
       msg 'syntax', "warning: missing template: $_";
@@ -277,7 +293,6 @@ $out->close;
 	  msg 'syntax',  "Use AC_DEFINE([$_], [], [Description])";
 	  $suggest_ac_define = 0;
 	}
-
     }
   exit 1
     if keys %symbol;
diff --git a/tests/tools.at b/tests/tools.at
index 4993b3f..2592a20 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -860,6 +860,31 @@ config.h.in:0
 AT_CLEANUP
 
 
+# autoheader should take all config header inputs into account when
+# checking for missing templates.
+AT_SETUP([autoheader with multiple headers])
+
+AT_DATA([config-extra.h.in],
+[[/* Define this to whatever you want. */
+#undef HANNA
+]])
+AT_DATA([configure.ac],
+[[AC_INIT
+AC_CONFIG_HEADERS([config.h config-extra.h])
+AC_DEFINE([HANNA], ["Hanna"])
+AC_DEFINE([SEAN], ["Sean"], [Sean's name])
+AC_OUTPUT
+]])
+
+AT_CHECK_AUTOCONF
+AT_CHECK_AUTOHEADER
+AT_CHECK([grep HANNA configure], [0], [ignore], [ignore])
+AT_CHECK([grep HANNA config.h.in], [1], [ignore], [ignore])
+AT_CHECK([grep SEAN configure], [0], [ignore], [ignore])
+AT_CHECK([grep SEAN config.h.in], [0], [ignore], [ignore])
+
+AT_CLEANUP
+
 
 
 ## ------------ ##


hooks/post-receive
-- 
GNU Autoconf source repository


From MAILER-DAEMON Thu Dec 22 14:35:45 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cK99U-0002Tx-Py
	for mharc-autoconf-commit@gnu.org; Thu, 22 Dec 2016 14:35:44 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42951)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cK99S-0002SY-8f
	for autoconf-commit@gnu.org; Thu, 22 Dec 2016 14:35:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cK99R-0004zx-96
	for autoconf-commit@gnu.org; Thu, 22 Dec 2016 14:35:42 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:48240)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cK99Q-0004zl-V5
	for autoconf-commit@gnu.org; Thu, 22 Dec 2016 14:35:41 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id B5F572201BA; Thu, 22 Dec 2016 19:35:40 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: autoconf-commit@gnu.org
Subject: [SCM] GNU Autoconf source repository branch, master,
	updated. v2.69-182-ga6b2acf
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 78ad1b0b2cea606bf401ed0262540b503db73e1c
X-Git-Newrev: a6b2acf29d66a1824572c27c2104d24a2b034790
Message-Id: <20161222193540.B5F572201BA@vcs.savannah.gnu.org>
Date: Thu, 22 Dec 2016 19:35:40 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: autoconf-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: Commits to the Autoconf git repository <autoconf-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/autoconf-commit/>
List-Post: <mailto:autoconf-commit@gnu.org>
List-Help: <mailto:autoconf-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2016 19:35:43 -0000

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=a6b2acf29d66a1824572c27c2104d24a2b034790

The branch, master has been updated
       via  a6b2acf29d66a1824572c27c2104d24a2b034790 (commit)
      from  78ad1b0b2cea606bf401ed0262540b503db73e1c (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 a6b2acf29d66a1824572c27c2104d24a2b034790
Author: Eric Blake <eblake@redhat.com>
Date:   Thu Dec 22 13:03:21 2016 -0600

    doc: Patterns in m4_pattern_forbid cause error, not warning
    
    The example text regarding a desired literal AC_DC in output
    claimed that the result would trigger a warning if one does
    not use creative quoting; but in reality, autoconf's use of
    m4_pattern_forbid to reserve the entire AC_ namespace makes
    it a hard error.  Reword the section to mention the use of
    m4_pattern_allow() as the fix, and beef up the example to
    better demonstrate the problem.
    
    * doc/autoconf.texi (Autoconf Language): Improve AC_DC example.
    Reported by Gavin Smith <gavinsmith0123@gmail.com>.
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 doc/autoconf.texi |   33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 7e710a5..01a8313 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1243,13 +1243,21 @@ AC_CHECK_HEADER(stdio.h,
                 AC_MSG_ERROR([sorry, can't do anything for you]))
 @end example
 
-In other cases, you may have to use text that also resembles a macro
-call.  You must quote that text even when it is not passed as a macro
-argument.  For example, these two approaches in @file{configure.ac}
-(quoting just the potential problems, or quoting the entire line) will
-protect your script in case autoconf ever adds a macro @code{AC_DC}:
-
-@example
+In other cases, you may want to use text that also resembles a macro
+call.  You must quote that text (whether just the potential problem, or
+the entire line) even when it is not passed as a macro argument; and you
+may also have to use @code{m4_pattern_allow} (@pxref{Forbidden
+Patterns}), to declare your intention that the resulting configure file
+will have a literal that resembles what would otherwise be reserved for
+a macro name.  For example:
+
+@example
+dnl Simulate a possible future autoconf macro
+m4_define([AC_DC], [oops])
+dnl Underquoted:
+echo "Hard rock was here!  --AC_DC"
+dnl Correctly quoted:
+m4_pattern_allow([AC_DC])
 echo "Hard rock was here!  --[AC_DC]"
 [echo "Hard rock was here!  --AC_DC"]
 @end example
@@ -1258,6 +1266,7 @@ echo "Hard rock was here!  --[AC_DC]"
 which results in this text in @file{configure}:
 
 @example
+echo "Hard rock was here!  --oops"
 echo "Hard rock was here!  --AC_DC"
 echo "Hard rock was here!  --AC_DC"
 @end example
@@ -1270,15 +1279,15 @@ quoting for all literal string arguments}, either around just the
 problematic portions, or over the entire argument:
 
 @example
+m4_pattern_allow([AC_DC])
 AC_MSG_WARN([[AC_DC] stinks  --Iron Maiden])
 AC_MSG_WARN([[AC_DC stinks  --Iron Maiden]])
 @end example
 
-However, the above example triggers a warning about a possibly
-unexpanded macro when running @command{autoconf}, because it collides
-with the namespace of macros reserved for the Autoconf language.  To be
-really safe, you can use additional escaping (either a quadrigraph, or
-creative shell constructs) to silence that particular warning:
+It is also possible to avoid the problematic patterns in the first
+place, by the use of additional escaping (either a quadrigraph, or
+creative shell constructs), in which case it is no longer necessary to
+use @code{m4_pattern_allow}:
 
 @example
 echo "Hard rock was here!  --AC""_DC"


hooks/post-receive
-- 
GNU Autoconf source repository


From MAILER-DAEMON Fri Dec 23 11:01:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cKSHM-0005UU-80
	for mharc-autoconf-commit@gnu.org; Fri, 23 Dec 2016 11:01:08 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42967)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cKSHJ-0005RA-CF
	for autoconf-commit@gnu.org; Fri, 23 Dec 2016 11:01:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cKSHI-0004VJ-56
	for autoconf-commit@gnu.org; Fri, 23 Dec 2016 11:01:05 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:53916)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cKSHI-0004V9-0s
	for autoconf-commit@gnu.org; Fri, 23 Dec 2016 11:01:04 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id B39782201BA; Fri, 23 Dec 2016 16:01:03 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: autoconf-commit@gnu.org
Subject: [SCM] GNU Autoconf source repository branch, master,
	updated. v2.69-183-g968215e
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a6b2acf29d66a1824572c27c2104d24a2b034790
X-Git-Newrev: 968215e7b4ea65e32ca7eda8fc5b211b4cec61d0
Message-Id: <20161223160103.B39782201BA@vcs.savannah.gnu.org>
Date: Fri, 23 Dec 2016 16:01:03 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: autoconf-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: Commits to the Autoconf git repository <autoconf-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/autoconf-commit/>
List-Post: <mailto:autoconf-commit@gnu.org>
List-Help: <mailto:autoconf-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/autoconf-commit>,
	<mailto:autoconf-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2016 16:01:06 -0000

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 <eblake@redhat.com>
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 <laine.emil@gmail.com>
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

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,
-@file{aclocal.m4}).
+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


