From MAILER-DAEMON Mon Mar 02 13:14:45 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LeCf7-0008AU-7y for mharc-autoconf-commit@gnu.org; Mon, 02 Mar 2009 13:14:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LeCf4-00087f-Pm for autoconf-commit@gnu.org; Mon, 02 Mar 2009 13:14:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LeCf3-000868-G3 for autoconf-commit@gnu.org; Mon, 02 Mar 2009 13:14:41 -0500 Received: from [199.232.76.173] (port=46150 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LeCf2-00085v-Ot for autoconf-commit@gnu.org; Mon, 02 Mar 2009 13:14:40 -0500 Received: from savannah.gnu.org ([199.232.41.3]:51262 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LeCf2-0003Xx-H4 for autoconf-commit@gnu.org; Mon, 02 Mar 2009 13:14:40 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LeCf2-0000oh-1z for autoconf-commit@gnu.org; Mon, 02 Mar 2009 18:14:40 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LeCey-0000o3-Fv for autoconf-commit@gnu.org; Mon, 02 Mar 2009 18:14:39 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b35598a688ebba088500e96735bf25f920db6192 X-Git-Newrev: 286c51ccf3eb56214d9386a93b5d71e297ecfb28 Message-Id: Date: Mon, 02 Mar 2009 18:14:39 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-283-g286c51c X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Mar 2009 18:14: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=286c51ccf3eb56214d9386a93b5d71e297ecfb28 The branch, master has been updated via 286c51ccf3eb56214d9386a93b5d71e297ecfb28 (commit) via ba524e662f6f0e0e6e149d192268ff16f3614ba4 (commit) from b35598a688ebba088500e96735bf25f920db6192 (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 286c51ccf3eb56214d9386a93b5d71e297ecfb28 Author: Allan Caffee Date: Mon Mar 2 11:11:19 2009 -0700 Fix a typo in comment for AS_LITERAL_IF. * lib/m4sugar/m4sh.m4 (AS_LITERAL_IF): Update a comment that fell out of date when this function was moved/renamed in 59ecd766. * THANKS: Update. Signed-off-by: Allan Caffee Signed-off-by: Eric Blake commit ba524e662f6f0e0e6e149d192268ff16f3614ba4 Author: Eric Blake Date: Mon Mar 2 10:29:35 2009 -0700 Improve wording for AS_ESCAPE. * doc/autoconf.texi (Common Shell Constructs) : Touch up documentation. * lib/m4sugar/m4sh.m4 (_AS_ESCAPE): Fix comment typos. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 15 +++++++++++++++ THANKS | 1 + doc/autoconf.texi | 11 +++++++---- lib/m4sugar/m4sh.m4 | 8 ++++---- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08f9e29..f2e6439 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2009-03-02 Allan Caffee (tiny change) + + Fix a typo in comment for AS_LITERAL_IF. + * lib/m4sugar/m4sh.m4 (AS_LITERAL_IF): Update a comment that fell + out of date when this function was moved/renamed in 59ecd766. + * THANKS: Update. + +2009-03-02 Eric Blake + + Improve wording for AS_ESCAPE. + * doc/autoconf.texi (Common Shell Constructs) : Touch + up documentation. + * lib/m4sugar/m4sh.m4 (_AS_ESCAPE): Fix comment typos. + Reported by Ralf Wildenhues. + 2009-02-24 Eric Blake Use pkgdatadir consistently. diff --git a/THANKS b/THANKS index 475ea30..5cb10cb 100644 --- a/THANKS +++ b/THANKS @@ -23,6 +23,7 @@ Alexandre Duret-Lutz duret_g@epita.fr Alexandre Julliard ? Alexandre Oliva oliva@lsd.ic.unicamp.br Alfred G. de Wijn dwijn@iluvatar.eu.org +Allan Caffee allan.caffee@gmail.com Andreas Buening andreas.buening@nexgo.de Andreas Jaeger aj@suse.de Andreas Schott schott@rzg.mpg.de diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 0c0740b..45ebdc6 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -12353,7 +12353,7 @@ and only contain characters from the set @samp{`\"$}; however, characters may be safely listed more than once in @var{chars} for the sake of syntax highlighting editors. The current implementation expands @var{string} after adding escapes; if @var{string} contains macro calls -that have text that needs quoting, you can use +that in turn expand to text needing shell quoting, you can use @code{AS_ESCAPE(m4_dquote(m4_expand([string])))}. The default for @var{chars} (@samp{\"$`}) is the set of characters @@ -12368,17 +12368,20 @@ here-doc; however, when using this variant, care must be taken that expansions (such as @samp{$@{foo-`echo "hi"`@}}) that would be broken with improper escapes. -This macro is often used with @code{AS_ECHO}. For example, this snippet -will produce shell code that outputs the four lines @samp{"$foo" = -"bar"}, @samp{macro}, @samp{a, b}, and @samp{a, \b}: +This macro is often used with @code{AS_ECHO}. For an example, observe +the output generated by the shell code generated from this snippet: @example foo=bar AS_ECHO(["AS_ESCAPE(["$foo" = ])AS_ESCAPE(["$foo"], [""])"]) +@result{}"$foo" = "bar" m4_define([macro], [a, [\b]]) AS_ECHO(["AS_ESCAPE([[macro]])"]) +@result{}macro AS_ECHO(["AS_ESCAPE([macro])"]) +@result{}a, b AS_ECHO(["AS_ESCAPE(m4_dquote(m4_expand([macro])))"]) +@result{}a, \b @end example @comment Should we add AS_ESCAPE_SINGLE? If we do, we can optimize in diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index e033063..d8ef957 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -696,13 +696,13 @@ m4_define([AS_ESCAPE], # _AS_ESCAPE(STRING, KEY, SET) # ---------------------------- -# Backslash-escape all instances of the singly byte KEY or up to four +# Backslash-escape all instances of the single byte KEY or up to four # bytes in SET occurring in STRING. Although a character can occur # multiple times, optimum efficiency occurs when KEY and SET are # distinct, and when SET does not exceed two bytes. These particular # semantics allow for the fewest number of parses of STRING, as well -# as taking advantage of newer m4's optimizations when m4_translit is -# passed SET of size 2 or smaller. +# as taking advantage of the optimizations in m4 1.4.13+ when +# m4_translit is passed SET of size 2 or smaller. m4_define([_AS_ESCAPE], [m4_if(m4_index(m4_translit([[$1]], [$3], [$2$2$2$2]), [$2]), [-1], [$0_], [m4_bpatsubst])([$1], [[$2$3]], [\\\&])]) @@ -1520,7 +1520,7 @@ m4_dquote(m4_dquote(m4_defn([m4_cr_symbols1])))[[))], [0], [$2], [$3])]) # AS_LITERAL_IF(EXPRESSION, IF-LITERAL, IF-NOT-LITERAL) # ----------------------------------------------------- # If EXPRESSION has shell indirections ($var or `expr`), expand -# IF-INDIR, else IF-NOT-INDIR. +# IF-LITERAL, else IF-NOT-LITERAL. # This is an *approximation*: for instance EXPRESSION = `\$' is # definitely a literal, but will not be recognized as such. # hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Sun Mar 08 06:24:33 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LgGBN-0006po-LY for mharc-autoconf-commit@gnu.org; Sun, 08 Mar 2009 06:24:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LgGBK-0006p3-M5 for autoconf-commit@gnu.org; Sun, 08 Mar 2009 06:24:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LgGBK-0006oa-10 for autoconf-commit@gnu.org; Sun, 08 Mar 2009 06:24:30 -0400 Received: from [199.232.76.173] (port=45400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LgGBJ-0006oX-Pf for autoconf-commit@gnu.org; Sun, 08 Mar 2009 06:24:29 -0400 Received: from savannah.gnu.org ([199.232.41.3]:35930 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LgGBJ-0007OX-Ho for autoconf-commit@gnu.org; Sun, 08 Mar 2009 06:24:29 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LgGBI-0004kH-Ii for autoconf-commit@gnu.org; Sun, 08 Mar 2009 10:24:28 +0000 Received: from rwild by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LgGBE-0004ji-U2 for autoconf-commit@gnu.org; Sun, 08 Mar 2009 10:24:28 +0000 From: "Ralf Wildenhues" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 286c51ccf3eb56214d9386a93b5d71e297ecfb28 X-Git-Newrev: 98647c53e4a73b8d215b97c3ce8aa08d38788a8b Message-Id: Date: Sun, 08 Mar 2009 10:24:27 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-284-g98647c5 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2009 10:24:31 -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=98647c53e4a73b8d215b97c3ce8aa08d38788a8b The branch, master has been updated via 98647c53e4a73b8d215b97c3ce8aa08d38788a8b (commit) from 286c51ccf3eb56214d9386a93b5d71e297ecfb28 (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 98647c53e4a73b8d215b97c3ce8aa08d38788a8b Author: Ralf Wildenhues Date: Sun Mar 8 11:24:06 2009 +0100 Manual: testsuite depends on package.m4. * doc/autoconf.texi (Making testsuite Scripts): In the example makefile snippet, $(TESTSUITE) depends on $(srcdir)/package.m4. Signed-off-by: Ralf Wildenhues ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ doc/autoconf.texi | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2e6439..413950f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-08 Ralf Wildenhues + + Manual: testsuite depends on package.m4. + * doc/autoconf.texi (Making testsuite Scripts): In the example + makefile snippet, $(TESTSUITE) depends on $(srcdir)/package.m4. + 2009-03-02 Allan Caffee (tiny change) Fix a typo in comment for AS_LITERAL_IF. diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 45ebdc6..cb1eb74 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -22505,7 +22505,7 @@ clean-local: AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): $(srcdir)/testsuite.at +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(srcdir)' -o $@@.tmp $@@.at mv $@@.tmp $@@ @end example hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Mon Mar 09 14:26:14 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LgkB4-0002iG-Jz for mharc-autoconf-commit@gnu.org; Mon, 09 Mar 2009 14:26:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LgkB2-0002eC-N0 for autoconf-commit@gnu.org; Mon, 09 Mar 2009 14:26:12 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LgkB1-0002cE-UT for autoconf-commit@gnu.org; Mon, 09 Mar 2009 14:26:12 -0400 Received: from [199.232.76.173] (port=50967 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LgkB1-0002br-Or for autoconf-commit@gnu.org; Mon, 09 Mar 2009 14:26:11 -0400 Received: from savannah.gnu.org ([199.232.41.3]:45946 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LgkB1-0005uX-Bh for autoconf-commit@gnu.org; Mon, 09 Mar 2009 14:26:11 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LgkB0-0007wj-FA for autoconf-commit@gnu.org; Mon, 09 Mar 2009 18:26:10 +0000 Received: from rwild by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LgkAw-0007w9-1J for autoconf-commit@gnu.org; Mon, 09 Mar 2009 18:26:10 +0000 From: "Ralf Wildenhues" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 98647c53e4a73b8d215b97c3ce8aa08d38788a8b X-Git-Newrev: ee55d7737cc623ad00cab035a51a1f96be7ef774 Message-Id: Date: Mon, 09 Mar 2009 18:26:09 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-285-gee55d77 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 18:26:12 -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=ee55d7737cc623ad00cab035a51a1f96be7ef774 The branch, master has been updated via ee55d7737cc623ad00cab035a51a1f96be7ef774 (commit) from 98647c53e4a73b8d215b97c3ce8aa08d38788a8b (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 ee55d7737cc623ad00cab035a51a1f96be7ef774 Author: Ralf Wildenhues Date: Mon Mar 9 19:25:18 2009 +0100 New test for SunStudio `restrict' handling. * tests/c.at (AC_C_RESTRICT and C++): New test. Prompted by bug report from Rolf Vandevaart. Signed-off-by: Ralf Wildenhues ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 +++++ tests/c.at | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 413950f..c81ac4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-09 Ralf Wildenhues + + New test for SunStudio `restrict' handling. + * tests/c.at (AC_C_RESTRICT and C++): New test. + Prompted by bug report from Rolf Vandevaart. + 2009-03-08 Ralf Wildenhues Manual: testsuite depends on package.m4. diff --git a/tests/c.at b/tests/c.at index d7a1886..33b2684 100644 --- a/tests/c.at +++ b/tests/c.at @@ -2,8 +2,8 @@ AT_BANNER([C low level compiling/preprocessing macros.]) -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free -# Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 +# 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 @@ -259,3 +259,66 @@ AC_DEFINE([__EXTENSIONS__], [1], [Manually defined for Solaris]) ]]) AT_CLEANUP + + +## ----------------------- ## +## AC_C_RESTRICT and C++. ## +## ----------------------- ## + +AT_SETUP([AC_C_RESTRICT and C++]) + +# In some compiler suites, the left hand doesn't know about everything +# the right hand does; or the user mixes the C compiler from one suite +# with the C++ compiler from another. In this case, Sun WorkShop CC +# not like the _Restrict accepted by cc. + +AT_DATA([configure.ac], +[[AC_INIT +AC_PROG_CC +AC_PROG_CXX +AC_C_RESTRICT +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT +]]) + +AT_DATA([Makefile.in], +[[CC = @CC@ +CXX = @CXX@ +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ +CPPFLAGS = -I. @CPPFLAGS@ +OBJEXT = @OBJEXT@ +all: foo.$(OBJEXT) bar.$(OBJEXT) +cpp-works: + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cpp-works.cpp +foo.$(OBJEXT): foo.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c foo.c +bar.$(OBJEXT): bar.cpp + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c bar.cpp +]]) + +AT_DATA([foo.c], +[[#include + +int foo (int * restrict i1, int * restrict i2) +{ + return i1[0] + i2[0]; +} +]]) + +cp foo.c bar.cpp + +AT_DATA([cpp-works.cpp], +[[// This file is just to test whether we have a working C++ compiler at all +class foo { int x; }; +class foo foobar; +]]) + +AT_CHECK([autoconf]) +AT_CHECK([autoheader]) +AT_CHECK([./configure], [], [ignore], [ignore]) +AT_CHECK([${MAKE-make} cpp-works || exit 77], [], [ignore], [ignore]) +AT_CHECK([${MAKE-make}], [], [ignore], [ignore]) + +AT_CLEANUP hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Sat Mar 14 18:24:28 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LicHM-0001R0-1H for mharc-autoconf-commit@gnu.org; Sat, 14 Mar 2009 18:24:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LicHK-0001Oq-Nz for autoconf-commit@gnu.org; Sat, 14 Mar 2009 18:24:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LicHJ-0001OJ-0m for autoconf-commit@gnu.org; Sat, 14 Mar 2009 18:24:25 -0400 Received: from [199.232.76.173] (port=56731 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LicHI-0001OG-S4 for autoconf-commit@gnu.org; Sat, 14 Mar 2009 18:24:24 -0400 Received: from savannah.gnu.org ([199.232.41.3]:47633 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LicHI-00023s-7M for autoconf-commit@gnu.org; Sat, 14 Mar 2009 18:24:24 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LicHH-0003SK-Gq for autoconf-commit@gnu.org; Sat, 14 Mar 2009 22:24:23 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LicHC-0003Rj-Fn for autoconf-commit@gnu.org; Sat, 14 Mar 2009 22:24:23 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ee55d7737cc623ad00cab035a51a1f96be7ef774 X-Git-Newrev: e994faac09d1760b28d9d1e4d95468ffdfc1bdab Message-Id: Date: Sat, 14 Mar 2009 22:24:22 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-286-ge994faa X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 22:24:27 -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=e994faac09d1760b28d9d1e4d95468ffdfc1bdab The branch, master has been updated via e994faac09d1760b28d9d1e4d95468ffdfc1bdab (commit) from ee55d7737cc623ad00cab035a51a1f96be7ef774 (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 e994faac09d1760b28d9d1e4d95468ffdfc1bdab Author: Eric Blake Date: Sat Mar 14 16:23:29 2009 -0600 Resync upstream files. * GNUmakefile: Run 'make fetch'. * build-aux/announce-gen: Likewise. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * build-aux/gnupload: Likewise. * build-aux/texinfo.tex: Likewise. * build-aux/vc-list-files: Likewise. * doc/gnu-oids.texi: Likewise. * doc/standards.texi: Likewise. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 13 ++ GNUmakefile | 23 +++- build-aux/announce-gen | 29 ++-- build-aux/config.guess | 5 +- build-aux/config.sub | 10 +- build-aux/gnupload | 360 ++++++++++++++++++++++++++++++++++++----------- build-aux/texinfo.tex | 30 +++- build-aux/vc-list-files | 6 +- doc/gnu-oids.texi | 7 +- doc/standards.texi | 16 ++- 10 files changed, 380 insertions(+), 119 deletions(-) diff --git a/ChangeLog b/ChangeLog index c81ac4c..6cef0d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-03-14 Eric Blake + + Resync upstream files. + * GNUmakefile: Run 'make fetch'. + * build-aux/announce-gen: Likewise. + * build-aux/config.guess: Likewise. + * build-aux/config.sub: Likewise. + * build-aux/gnupload: Likewise. + * build-aux/texinfo.tex: Likewise. + * build-aux/vc-list-files: Likewise. + * doc/gnu-oids.texi: Likewise. + * doc/standards.texi: Likewise. + 2009-03-09 Ralf Wildenhues New test for SunStudio `restrict' handling. diff --git a/GNUmakefile b/GNUmakefile index 0fdd3fa..33eb3aa 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -5,7 +5,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2009 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 @@ -38,6 +38,9 @@ ifeq ($(_have-Makefile),yes) # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner +# Allow the user to add to this in the Makefile. +ALL_RECURSIVE_TARGETS = + include Makefile # Some projects override e.g., _autoreconf here. @@ -61,7 +64,7 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) && $(_build-aux)/git-version-gen .tarball-version) ifneq ($(_curr-ver),$(VERSION)) ifeq ($(_curr-ver),UNKNOWN) - $(info WARNING: unable to verify if $(VERSION) is correct version) + $(info WARNING: unable to verify if $(VERSION) is the correct version) else ifneq (,$(_is-install-target)) # GNU Coding Standards state that 'make install' should not cause @@ -107,6 +110,18 @@ abort-due-to-no-makefile: endif # Tell version 3.79 and up of GNU make to not build goals in this -# directory in parallel. This is necessary in case someone tries to -# build multiple targets on one command line. +# directory in parallel, in case someone tries to build multiple +# targets, and one of them can cause a recursive target to be invoked. + +# Only set this if Automake doesn't provide it. +AM_RECURSIVE_TARGETS ?= $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) \ + dist distcheck tags ctags + +ALL_RECURSIVE_TARGETS += $(AM_RECURSIVE_TARGETS) + +ifneq ($(word 2, $(MAKECMDGOALS)), ) +ifneq ($(filter $(ALL_RECURSIVE_TARGETS), $(MAKECMDGOALS)), ) .NOTPARALLEL: +endif +endif diff --git a/build-aux/announce-gen b/build-aux/announce-gen index d1a4b25..e5e7491 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -1,13 +1,13 @@ #!/usr/bin/perl -w # Generate a release announcement message. -my $VERSION = '2008-12-02 16:28'; # UTC +my $VERSION = '2009-03-05 09:52'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2009 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 @@ -34,6 +34,7 @@ use POSIX qw(strftime); (my $ME = $0) =~ s|.*/||; my %valid_release_types = map {$_ => 1} qw (alpha beta major); +my @archive_suffixes = ('tar.gz', 'tar.bz2', 'tar.lzma', 'tar.xz'); END { @@ -96,6 +97,8 @@ The following are optional: VERSION is the result of running git describe in the gnulib source directory. required if gnulib is in TOOL_LIST. + --no-print-checksums do not emit MD5 or SHA1 checksums + --archive-suffix=SUF add SUF to the list of archive suffixes --help display this help and exit --version output version information and exit @@ -185,8 +188,7 @@ sub print_checksums (@) print "$dig $f\n"; } } - - + print "\n"; } =item C \@news_file, 'bootstrap-tools=s' => \$bootstrap_tools, 'gnulib-version=s' => \$gnulib_version, + 'print-checksums!' => \$print_checksums_p, + 'archive-suffix=s' => \@archive_suffixes, help => sub { usage 0 }, version => sub { print "$ME version $VERSION\n"; exit }, @@ -426,16 +431,14 @@ sub get_tool_versions ($$) and usage 1; my $my_distdir = "$package_name-$curr_version"; - my $tgz = "$my_distdir.tar.gz"; - my $tbz = "$my_distdir.tar.bz2"; - my $lzma = "$my_distdir.tar.lzma"; - my $xz = "$my_distdir.tar.xz"; my $xd = "$package_name-$prev_version-$curr_version.xdelta"; - my @tarballs = grep {-f $_} ($tgz, $tbz, $lzma, $xz); + my @candidates = map { "$my_distdir.$_" } @archive_suffixes; + my @tarballs = grep {-f $_} @candidates; + @tarballs - or die "$ME: none of $tgz, $tbz, $lzma or $xz were found\n"; + or die "$ME: none of " . join(', ', @candidates) . " were found\n"; my @sizable = @tarballs; -f $xd and push @sizable, $xd; @@ -464,16 +467,16 @@ EOF print_locations ("GPG detached signatures[*]", @url_dir_list, %size, @sig_files); - print_checksums (@sizable); + $print_checksums_p + and print_checksums (@sizable); print <&2 diff --git a/build-aux/config.sub b/build-aux/config.sub index 9489dc7..d546a94 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-12-11' +timestamp='2009-02-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -445,6 +446,10 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -1256,8 +1261,9 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/build-aux/gnupload b/build-aux/gnupload index 12c9394..7c34784 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,9 +1,9 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2008-11-12.21 +scriptversion=2009-03-05.20 -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation # # 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 @@ -23,98 +23,193 @@ scriptversion=2008-11-12.21 set -e GPG='gpg --batch --no-tty' +conffile=.gnuploadrc to= -delete=false +dry_run=false +symlink_files= +delete_files= +delete_symlinks= +collect_var= +dbg= -usage="Usage: $0 [OPTIONS]... FILES... +usage="Usage: $0 [OPTIONS]... [COMMAND] FILES... [[COMMAND] FILES...] -Sign all FILES, and upload them to (or delete them from) selected -destinations, according to +Sign all FILES, and upload them to selected destinations, according to . +Commands: + --delete delete FILES from destination + --symlink create symbolic links + --rmsymlink remove symbolic links + -- treat the remaining arguments as files to upload + Options: --help print this help text and exit --to DEST specify one destination for FILES (multiple --to options are allowed) --user NAME sign with key NAME - --delete delete FILES from destination instead of uploading + --symlink-regex[=EXPR] use sed script EXPR to compute symbolic link names + --dry-run do nothing, show what would have been done --version output version information and exit +If --symlink-regex is given without EXPR, then the link target name +is created by replacing the version information with \`-latest', e.g.: + + foo-1.3.4.tar.gz -> foo-latest.tar.gz + Recognized destinations are: alpha.gnu.org:DIRECTORY savannah.gnu.org:DIRECTORY savannah.nongnu.org:DIRECTORY ftp.gnu.org:DIRECTORY build directive files and upload files by FTP + download.gnu.org.ua:{alpha|ftp}/DIRECTORY + build directive files and upload files by SFTP [user@]host:DIRECTORY upload files with scp -Deletion only works for ftp.gnu.org and alpha.gnu.org (using the -archive: directive). Otherwise it is a no-op. Deleting a file foo also -deletes foo.sig; do not specify the .sig explicitly. +Options and commands are applied in order. If the file $conffile exists +in the current working directory, its contents are prepended to the +actual command line options. Use this to keep your defaults. Comments +(#) and empty lines in $conffile are allowed. + +Examples: +1. Upload automake-1.8.2b.tar.gz and automake-1.8.2b.tar.bz2 to two sites: + gnupload --to sources.redhat.com:~ftp/pub/automake \\ + --to alpha.gnu.org:automake \\ + automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2 + +2. Same as above, but also create symbolic links to automake-latest.tar.*: + gnupload --to sources.redhat.com:~ftp/pub/automake \\ + --to alpha.gnu.org:automake \\ + --symlink-regex \\ + automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2 + +3. Symlink automake-1.8.2b.tar.gz to automake-latest.tar.gz and +automake-1.8.2b.tar.bz2 to automake-latest.tar.bz2 on both sites: -Simple single-target single-file examples: - gnupload --to alpha.gnu.org:automake automake-1.8.2b.tar.gz - gnupload --to ftp.gnu.org:automake automake-1.8.3.tar.gz - gnupload --to alpha.gnu.org:automake --delete automake-oops.tar.gz + gnupload --to sources.redhat.com:~ftp/pub/automake \\ + --to alpha.gnu.org:automake \\ + --symlink automake-1.8.2b.tar.gz automake-latest.tar.gz \\ + automake-1.8.2b.tar.bz2 automake-latest.tar.bz2 + +4. Delete automake-1.8.2a.tar.gz and .bz2, remove symlink +automake-latest.tar.gz and upload automake-1.8.2b.tar.gz: -Multiple-target multiple-file example: gnupload --to sources.redhat.com:~ftp/pub/automake \\ --to alpha.gnu.org:automake \\ + --delete automake-1.8.2a.tar.gz automake-1.8.2a.tar.bz2 \\ + --rmsymlink automake-latest.tar.gz \\ + -- \\ automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2 Report bugs to . Send patches to ." +# Read local configuration file +if test -r "$conffile"; then + echo "$0: Reading configuration file $conffile" + eval set x "`sed 's/#.*$//;/^$/d' \"$conffile\" | tr '\012\015' ' '` \"\$@\"" + shift +fi + while test -n "$1"; do case $1 in - --delete) - delete=true - shift - ;; + -*) + collect_var= + case $1 in --help) echo "$usage" exit $? ;; --to) if test -z "$2"; then - echo "$0: Missing argument for --to" 1>&2 + echo "$0: Missing argument for --to" 1>&2 exit 1 else to="$to $2" - shift 2 + shift fi ;; --user) if test -z "$2"; then - echo "$0: Missing argument for --user" 1>&2 + echo "$0: Missing argument for --user" 1>&2 exit 1 else GPG="$GPG --local-user $2" - shift 2 + shift fi ;; + --delete) + collect_var=delete_files + ;; + --rmsymlink) + collect_var=delete_symlinks + ;; + --symlink-regex=*) + symlink_expr=`expr "$1" : '[^=]*=\(.*\)'` + ;; + --symlink-regex) + symlink_expr='s|-[0-9][0-9\.]*\(-[0-9][0-9]*\)\{0,1\}\.|-latest.|' + ;; + --symlink) + collect_var=symlink_files + ;; + --dry-run|-n) + dry_run=: + ;; --version) echo "gnupload $scriptversion" exit $? ;; + --) + shift + break + ;; -*) echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2 exit 1 ;; - *) + esac + ;; + *) + if test -z "$collect_var"; then break - ;; + else + eval "$collect_var=\"\$$collect_var $1\"" + fi + ;; esac + shift done -if test $# = 0; then - echo "$0: No file to upload or delete" 1>&2 +dprint() +{ + echo "Running $*..." +} + +if $dry_run; then + dbg=dprint +fi + +if test -z "$to"; then + echo "$0: Missing destination sites" >&2 exit 1 -else - : fi -if $delete; then :; else +if test -n "$symlink_files"; then + x=`echo "$symlink_files" | sed 's/[^ ]//g;s/ //g'` + if test -n "$x"; then + echo "$0: Odd number of symlink arguments" >&2 + exit 1 + fi +fi + +if test $# = 0; then + if test -z "${symlink_files}${delete_files}${delete_symlinks}"; then + echo "$0: No file to upload" 1>&2 + exit 1 + fi +else # Make sure all files exist. We don't want to ask # for the passphrase if the script will fail. for file @@ -122,8 +217,15 @@ if $delete; then :; else if test ! -f $file; then echo "$0: Cannot find \`$file'" 1>&2 exit 1 - else - : + elif test -n "$symlink_expr"; then + linkname=`echo $file | sed "$symlink_expr"` + if test -z "$linkname"; then + echo "$0: symlink expression produces empty results" >&2 + exit 1 + elif test "$linkname" = $file; then + echo "$0: symlink expression does not alter file name" >&2 + exit 1 + fi fi done fi @@ -143,72 +245,164 @@ read -r passphrase stty echo echo -# Nothing to sign if deleting. -if $delete; then :; else +if test $# -ne 0; then for file do echo "Signing $file..." rm -f $file.sig - echo $passphrase | $GPG --passphrase-fd 0 -ba -o $file.sig $file + echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file + done +fi + + +# mkdirective DESTDIR BASE FILE STMT +# Arguments: See upload, below +mkdirective () +{ + stmt="$4" + if test -n "$3"; then + stmt=" +filename: $3$stmt" + fi + + cat >${2}.directive<&2 + fi + $dbg ncftpput savannah.gnu.org /incoming/savannah/$destdir $files + ;; + savannah.nongnu.org:*) + if test -z "$files"; then + echo "$0: warning: standalone directives not applicable for $dest" >&2 + fi + $dbg ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files + ;; + download.gnu.org.ua:alpha/*|download.gnu.org.ua:ftp/*) + destdir_p1=`echo "$destdir" | sed 's,^[^/]*/,,'` + destdir_topdir=`echo "$destdir" | sed 's,/.*,,'` + mkdirective "$destdir_p1" "$base" "$file" "$stmt" + echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign $base.directive + for f in $files $base.directive.asc + do + echo put $f + done | $dbg sftp -b - puszcza.gnu.org.ua:/incoming/$destdir_topdir + ;; + /*) + dest_host=`echo "$dest" | sed 's,:.*,,'` + mkdirective "$destdir" "$base" "$file" "$stmt" + echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign $base.directive + $dbg cp $files $base.directive.asc $dest_host + ;; + *) + if test -z "$files"; then + echo "$0: warning: standalone directives not applicable for $dest" >&2 + fi + $dbg scp $files $dest + ;; + esac + rm -f $base.directive $base.directive.asc +} + +##### +# Process any standalone directives +stmt= +if test -n "$symlink_files"; then + stmt="$stmt +`mksymlink $symlink_files`" +fi + +for file in $delete_files +do + stmt="$stmt +archive: $file" +done + +for file in $delete_symlinks +do + stmt="$stmt +rmsymlink: $file" +done + +if test -n "$stmt"; then + for dest in $to + do + destdir=`echo $dest | sed 's/[^:]*://'` + upload "$dest" "$destdir" "`hostname`-$$" "" "$stmt" done fi +# Process actual uploads for dest in $to do for file do - # Prepare arguments. - if $delete; then - echo "Removing $file from $dest..." - files= # nothing to upload if deleting - directive="archive: $file" - else - echo "Uploading $file to $dest..." - files="$file $file.sig" - directive="filename: "`basename -- "$file"` - fi + echo "Uploading $file to $dest..." + stmt= + files="$file $file.sig" destdir=`echo $dest | sed 's/[^:]*://'` - - case $dest in - alpha.gnu.org:*) - rm -f $file.directive $file.directive.asc - cat >$file.directive<$file.directive< 1.3.6.1.4.1.11591.5 GNU Mailutils +@c Added 2009-03-03 on request from Simon Josefsson +1.3.6.1.4.1.11591.5 GNU Shishi + 1.3.6.1.4.1.11591.12 digestAlgorithm 1.3.6.1.4.1.11591.12.2 TIGER/192 1.3.6.1.4.1.11591.13 encryptionAlgorithm diff --git a/doc/standards.texi b/doc/standards.texi index bd90a92..a2ddaf2 100644 --- a/doc/standards.texi +++ b/doc/standards.texi @@ -3,7 +3,7 @@ @setfilename standards.info @settitle GNU Coding Standards @c This date is automagically updated when you save this file: -@set lastupdate November 6, 2008 +@set lastupdate January 31, 2009 @c %**end of header @dircategory GNU organization @@ -27,7 +27,7 @@ The GNU coding standards, last updated @value{lastupdate}. Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software +2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document @@ -1086,13 +1086,19 @@ is seen, and the program should not perform its normal function. @cindex address for bug reports @cindex bug reports -Near the end of the @samp{--help} option's output there should be a line -that says where to mail bug reports. It should have this format: +Near the end of the @samp{--help} option's output, please place lines +giving the email address for bug reports, the package's home page +(normally @indicateurl{http://www.gnu.org/software/@var{pkg}}, and the +general page for help using GNU programs. The format should be like this: @example -Report bugs to @var{mailing-address}. +Report bugs to: @var{mailing-address} +@var{pkg} home page: +General help using GNU software: @end example +It is ok to mention other appropriate mailing lists and web pages. + @node Option Table @section Table of Long Options hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Mon Mar 16 19:04:44 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LjLrQ-0000Fj-IU for mharc-autoconf-commit@gnu.org; Mon, 16 Mar 2009 19:04:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LjLrP-0000FP-1C for autoconf-commit@gnu.org; Mon, 16 Mar 2009 19:04:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LjLrM-0000Cr-AI for autoconf-commit@gnu.org; Mon, 16 Mar 2009 19:04:41 -0400 Received: from [199.232.76.173] (port=34064 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LjLrM-0000Co-4n for autoconf-commit@gnu.org; Mon, 16 Mar 2009 19:04:40 -0400 Received: from savannah.gnu.org ([199.232.41.3]:52557 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LjLrL-0006tW-Nq for autoconf-commit@gnu.org; Mon, 16 Mar 2009 19:04:39 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LjLrL-0000SN-75 for autoconf-commit@gnu.org; Mon, 16 Mar 2009 23:04:39 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LjLrJ-0000Rt-VI for autoconf-commit@gnu.org; Mon, 16 Mar 2009 23:04:39 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e994faac09d1760b28d9d1e4d95468ffdfc1bdab X-Git-Newrev: 239b0528b2dde294542b2a12b1d4811107cc8a30 Message-Id: Date: Mon, 16 Mar 2009 23:04:38 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-287-g239b052 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Mar 2009 23:04: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=239b0528b2dde294542b2a12b1d4811107cc8a30 The branch, master has been updated via 239b0528b2dde294542b2a12b1d4811107cc8a30 (commit) from e994faac09d1760b28d9d1e4d95468ffdfc1bdab (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 239b0528b2dde294542b2a12b1d4811107cc8a30 Author: Eric Blake Date: Mon Mar 16 17:03:27 2009 -0600 Fix 'make pdf'. * doc/autoconf.texi (Balancing Parentheses): Fix usage of @itemize. Reported by Ralf Wildenhues, fix suggested by Karl Berry. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ doc/autoconf.texi | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cef0d2..78ac194 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-03-16 Eric Blake + + Fix 'make pdf'. + * doc/autoconf.texi (Balancing Parentheses): Fix usage of + @itemize. + Reported by Ralf Wildenhues, fix suggested by Karl Berry. + 2009-03-14 Eric Blake Resync upstream files. diff --git a/doc/autoconf.texi b/doc/autoconf.texi index cb1eb74..6109bb2 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -9866,7 +9866,7 @@ arguments to macro calls. On the other hand, there are several variations for defining @code{my_case} to be more robust, even when used without proper quoting, each with some benefits and some drawbacks. -@itemize @asis +@itemize @w{} @item Creative literal shell comment @example AC_DEFUN([my_case], hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 17 10:50:31 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Ljach-0006Qw-2o for mharc-autoconf-commit@gnu.org; Tue, 17 Mar 2009 10:50:31 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ljacf-0006P8-9B for autoconf-commit@gnu.org; Tue, 17 Mar 2009 10:50:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ljace-0006OL-9W for autoconf-commit@gnu.org; Tue, 17 Mar 2009 10:50:28 -0400 Received: from [199.232.76.173] (port=37832 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ljacd-0006OB-Tx for autoconf-commit@gnu.org; Tue, 17 Mar 2009 10:50:27 -0400 Received: from savannah.gnu.org ([199.232.41.3]:51697 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ljacd-0007St-F1 for autoconf-commit@gnu.org; Tue, 17 Mar 2009 10:50:27 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ljacc-0004WU-Pt for autoconf-commit@gnu.org; Tue, 17 Mar 2009 14:50:26 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LjacQ-0004Ud-LG for autoconf-commit@gnu.org; Tue, 17 Mar 2009 14:50:26 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 239b0528b2dde294542b2a12b1d4811107cc8a30 X-Git-Newrev: efb3e8a738994924dfed0e1d73c91e0678622b3b Message-Id: Date: Tue, 17 Mar 2009 14:50:26 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-291-gefb3e8a X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Mar 2009 14:50:29 -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=efb3e8a738994924dfed0e1d73c91e0678622b3b The branch, master has been updated via efb3e8a738994924dfed0e1d73c91e0678622b3b (commit) via e5f657f31e671e95c4989a2840d5053ed1f3cda6 (commit) via 996eb0c086f82492d7623d5105abdd450812e460 (commit) via 26a4c7275d690900c7c4b4ab9017e6fcce00f372 (commit) from 239b0528b2dde294542b2a12b1d4811107cc8a30 (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 efb3e8a738994924dfed0e1d73c91e0678622b3b Author: Eric Blake Date: Tue Mar 17 07:39:40 2009 -0600 Use test consistently in examples. * doc/autoconf.texi (Subdirectories, Caching Results) (Common Shell Constructs, Prerequisite Macros, Coding Style) (Changed Results, Particular Programs, Defining Symbols): Protect against arbitrary user strings. (Multiple Cases): Mention why $fstype does not need protection. Reported by Reuben Thomas. Signed-off-by: Eric Blake commit e5f657f31e671e95c4989a2840d5053ed1f3cda6 Author: Eric Blake Date: Tue Mar 17 06:38:07 2009 -0600 Improve confusing section names. * doc/autoconf.texi (Specifying Names): Rename node... (Specifying Target Triplets): ...to this. (Generic Programs): Adjust references. * doc/install.texi (System Type): Touch up formatting. * THANKS: Update. Reported by Tim Freeman, in http://bugs.debian.org/312873. Signed-off-by: Eric Blake commit 996eb0c086f82492d7623d5105abdd450812e460 Author: Eric Blake Date: Tue Mar 17 06:09:22 2009 -0600 Remove historical inaccuracy. * doc/autoconf.texi (Portable Shell): Don't perpetuate myth about Reported by Reuben Thomas. Signed-off-by: Eric Blake commit 26a4c7275d690900c7c4b4ab9017e6fcce00f372 Author: Eric Blake Date: Tue Mar 17 06:05:11 2009 -0600 Recommend AS_HELP_STRING more prominently. * doc/autoconf.texi (External Software): Reduce mention of hand-written help strings. Reported by Reuben Thomas. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 28 +++++++++++++++++++++ THANKS | 1 + doc/autoconf.texi | 71 ++++++++++++++++++++++++++--------------------------- doc/install.texi | 5 ++- 4 files changed, 67 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78ac194..05e3a4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2009-03-17 Eric Blake + + Use test consistently in examples. + * doc/autoconf.texi (Subdirectories, Caching Results) + (Common Shell Constructs, Prerequisite Macros, Coding Style) + (Changed Results, Particular Programs, Defining Symbols): + Protect against arbitrary user strings. + (Multiple Cases): Mention why $fstype does not need protection. + Reported by Reuben Thomas. + + Improve confusing section names. + * doc/autoconf.texi (Specifying Names): Rename node... + (Specifying Target Triplets): ...to this. + (Generic Programs): Adjust references. + * doc/install.texi (System Type): Touch up formatting. + * THANKS: Update. + Reported by Tim Freeman, in http://bugs.debian.org/312873. + + Remove historical inaccuracy. + * doc/autoconf.texi (Portable Shell): Don't perpetuate myth about + #!/bin/sh needing a space. + Reported by Reuben Thomas. + + Recommend AS_HELP_STRING more prominently. + * doc/autoconf.texi (External Software): Reduce mention of + hand-written help strings. + Reported by Reuben Thomas. + 2009-03-16 Eric Blake Fix 'make pdf'. diff --git a/THANKS b/THANKS index 5cb10cb..c3e19a2 100644 --- a/THANKS +++ b/THANKS @@ -342,6 +342,7 @@ Ted Bullock tbullock@canada.com Theodore Ts'o tytso@mit.edu Thien-Thi Nguyen ttn@gnu.org Thomas Winder tom@vlsivie.tuwien.ac.at +Tim Freeman tim@fungible.com Tim Mooney mooney@dogbert.cc.ndsu.NoDak.edu Tim Rice tim@multitalents.net Tim Van Holder tim.van.holder@pandora.be diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 6109bb2..a0a19b8 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -537,7 +537,7 @@ Portable C and C++ Programming Manual Configuration -* Specifying Names:: Specifying the system type +* Specifying Target Triplets:: Specifying target triplets * Canonicalizing:: Getting the canonical system type * Using System Type:: What to do with the system type @@ -3510,7 +3510,7 @@ Make @code{AC_OUTPUT} run @command{configure} in each subdirectory be a literal, i.e., please do not use: @example -if test "$package_foo_enabled" = yes; then +if test "x$package_foo_enabled" = xyes; then $my_subdirs="$my_subdirs foo" fi AC_CONFIG_SUBDIRS([$my_subdirs]) @@ -3522,7 +3522,7 @@ displaying the options of the package @code{foo}. Instead, you should write: @example -if test "$package_foo_enabled" = yes; then +if test "x$package_foo_enabled" = xyes; then AC_CONFIG_SUBDIRS([foo]) fi @end example @@ -3930,7 +3930,7 @@ is suggested that you use this Autoconf snippet: @example AC_PROG_LEX -if test "$LEX" != flex; then +if test "x$LEX" != xflex; then LEX="$SHELL $missing_dir/missing flex" AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy]) AC_SUBST([LEXLIB], ['']) @@ -4058,7 +4058,7 @@ with a prefix of the target type as determined by If the tool cannot be found with a prefix, and if the build and target types are equal, then it is also searched for without a prefix. -As noted in @ref{Specifying Names, , Specifying the system type}, the +As noted in @ref{Specifying Target Triplets}, the target is rarely specified, because most of the time it is the same as the host: it is the type of system for which any compiler tool in the package produces code. What this macro looks for is, @@ -4084,8 +4084,7 @@ sets @code{RANLIB} to @file{i386-gnu-ranlib} if that program exists in When cross-compiling, this macro will issue a warning if no program prefixed with the host type could be found. -For more information, see @ref{Specifying Names, , Specifying the -system type}. +For more information, see @ref{Specifying Target Triplets}. @end defmac @defmac AC_CHECK_TARGET_TOOLS (@var{variable}, @var{progs-to-check-for}, @ @@ -4118,8 +4117,7 @@ is not changed. Calls @code{AC_SUBST} for @var{variable}. When cross-compiling, this macro will issue a warning if no program prefixed with the host type could be found. -For more information, see @ref{Specifying Names, , Specifying the -system type}. +For more information, see @ref{Specifying Target Triplets}. @end defmac @anchor{AC_PATH_PROG} @@ -4197,8 +4195,7 @@ name of the program if it is found. When cross-compiling, this macro will issue a warning if no program prefixed with the host type could be found. -For more information, see @ref{Specifying Names, , Specifying the -system type}. +For more information, see @ref{Specifying Target Triplets}. @end defmac @@ -8609,7 +8606,9 @@ easy to simulate by using a shell variable to keep track of whether a way to perform the operation has been found yet. Here is an example that uses the shell variable @code{fstype} to keep -track of whether the remaining cases need to be checked. +track of whether the remaining cases need to be checked. Note that +since the value of @code{fstype} is under our control, we don't have to +use the longer @samp{test "x$fstype" = xno}. @example @group @@ -8677,7 +8676,7 @@ appropriate cache variable, as in this example: @example AC_CHECK_FUNC([vprintf], [AC_DEFINE([HAVE_VPRINTF], [1], [Define if vprintf exists.])]) -if test "$ac_cv_func_vprintf" != yes; then +if test "x$ac_cv_func_vprintf" != xyes; then AC_CHECK_FUNC([_doprnt], [AC_DEFINE([HAVE_DOPRNT], [1], [Define if _doprnt exists.])]) fi @@ -9019,7 +9018,7 @@ AC_DEFUN([AC_SHELL_TRUE], [AC_CACHE_CHECK([whether true(1) works], [my_cv_shell_true_works], [my_cv_shell_true_works=no (true) 2>/dev/null && my_cv_shell_true_works=yes - if test "$my_cv_shell_true_works" = yes; then + if test "x$my_cv_shell_true_works" = xyes; then AC_DEFINE([TRUE_WORKS], [1], [Define if `true(1)' works properly.]) fi]) @@ -9038,7 +9037,7 @@ AC_DEFUN([AC_SHELL_TRUE], [AC_CACHE_CHECK([whether true(1) works], [my_cv_shell_true_works], [my_cv_shell_true_works=no (true) 2>/dev/null && my_cv_shell_true_works=yes]) - if test "$my_cv_shell_true_works" = yes; then + if test "x$my_cv_shell_true_works" = xyes; then AC_DEFINE([TRUE_WORKS], [1], [Define if `true(1)' works properly.]) fi @@ -12411,8 +12410,8 @@ simplifications if either @var{run-if-true1} or @var{run-if-false} is empty. For example, @example -AS_IF([test "$foo" = yes], [HANDLE_FOO([yes])], - [test "$foo" != no], [HANDLE_FOO([maybe])], +AS_IF([test "x$foo" = xyes], [HANDLE_FOO([yes])], + [test "x$foo" != xno], [HANDLE_FOO([maybe])], [echo foo not specified]) @end example @@ -12465,7 +12464,7 @@ Transform @var{expression} into a valid shell variable name. For example: # This outputs "Have it!". header="sys/some file.h" AS_TR_SH([HAVE_$header])=yes -if test "$HAVE_sys_some_file_h" = yes; then echo "Have it!"; fi +if test "x$HAVE_sys_some_file_h" = xyes; then echo "Have it!"; fi @end example @end defmac @@ -13145,7 +13144,7 @@ AC_DEFUN([TRAVOLTA], [test "$body_temperature_in_celsius" -gt "38" && dance_floor=occupied]) AC_DEFUN([NEWTON_JOHN], -[test "$hair_style" = "curly" && +[test "x$hair_style" = xcurly && dance_floor=occupied]) @end group @@ -13164,7 +13163,7 @@ with this @file{configure.ac} @example AC_INIT([Dance Manager], [1.0], [bug-dance@@example.org]) RESERVE_DANCE_FLOOR -if test "$dance_floor" = occupied; then +if test "x$dance_floor" = xoccupied; then AC_MSG_ERROR([cannot pick up here, let's move]) fi @end example @@ -13177,7 +13176,7 @@ other times than Saturday night since it expands into: @group test "$body_temperature_in_Celsius" -gt "38" && dance_floor=occupied -test "$hair_style" = "curly" && +test "x$hair_style" = xcurly && dance_floor=occupied fi if date | grep '^Sat.*pm' >/dev/null 2>&1; then @@ -13609,7 +13608,7 @@ AC_DEFUN(_AC_EMXOS2, [AC_CACHE_CHECK(for EMX OS/2 environment, ac_cv_emxos2, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, return __EMX__;)], ac_cv_emxos2=yes, ac_cv_emxos2=no)]) -test "$ac_cv_emxos2" = yes && EMXOS2=yes]) +test "x$ac_cv_emxos2" = xyes && EMXOS2=yes]) @end example @noindent @@ -13624,7 +13623,7 @@ m4_define([_AC_EMXOS2], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [return __EMX__;])], [ac_cv_emxos2=yes], [ac_cv_emxos2=no])]) -test "$ac_cv_emxos2" = yes && EMXOS2=yes[]dnl +test "x$ac_cv_emxos2" = xyes && EMXOS2=yes[]dnl ])# _AC_EMXOS2 @end example @@ -13691,8 +13690,6 @@ Builtins, , Limitations of Shell Builtins}. Some ancient systems have quite small limits on the length of the @samp{#!} line; for instance, 32 bytes (not including the newline) on SunOS 4. -A few ancient 4.2@acronym{BSD} based systems (such as Dynix circa 1984) -required a single space between the @samp{#!} and the @samp{/}. However, these ancient systems are no longer of practical concern. The set of external programs you should run in a @command{configure} script @@ -18974,18 +18971,22 @@ looking for libraries that are unique to particular systems. However, Autoconf provides a uniform method for handling unguessable features. @menu -* Specifying Names:: Specifying the system type +* Specifying Target Triplets:: Specifying target triplets * Canonicalizing:: Getting the canonical system type * Using System Type:: What to do with the system type @end menu -@node Specifying Names -@section Specifying the System Type +@node Specifying Target Triplets +@section Specifying target triplets @cindex System type +@cindex Target triplet +@c This node used to be named Specifying Names. The @anchor allows old +@c links to still work. +@anchor{Specifying Names} Autoconf-generated @command{configure} scripts can make decisions based on a canonical name -for the system type, which has the form: +for the system type, or @dfn{target triplet}, which has the form: @samp{@var{cpu}-@var{vendor}-@var{os}}, where @var{os} can be @samp{@var{system}} or @samp{@var{kernel}-@var{system}} @@ -18995,7 +18996,8 @@ system it's running on. To do so it runs a script called command or symbols predefined by the C preprocessor. Alternately, the user can specify the system type with command line -arguments to @command{configure}. Doing so is necessary when +arguments to @command{configure} (@pxref{System Type}. Doing so is +necessary when cross-compiling. In the most complex case of cross-compiling, three system types are involved. The options to specify them are: @@ -19328,11 +19330,8 @@ looks like this: @noindent @var{help-string} may be more than one line long, if more detail is needed. Just make sure the columns line up in @samp{configure ---help}. Avoid tabs in the help string. You'll need to enclose the -help string in @samp{[} and @samp{]} in order to produce the leading -blanks. - -You should format your @var{help-string} with the macro +--help}. Avoid tabs in the help string. The easiest way to provide the +proper leading whitespace is to format your @var{help-string} with the macro @code{AS_HELP_STRING} (@pxref{Pretty Help Strings}). The following example shows how to use the @code{AC_ARG_WITH} macro in @@ -21450,7 +21449,7 @@ Here is a way to write it for version 2: @example AC_CHECK_FUNCS([syslog]) -if test $ac_cv_func_syslog = no; then +if test "x$ac_cv_func_syslog" = xno; then # syslog is not in the default libraries. See if it's in some other. for lib in bsd socket inet; do AC_CHECK_LIB([$lib], [syslog], [AC_DEFINE([HAVE_SYSLOG]) diff --git a/doc/install.texi b/doc/install.texi index d498639..a51882c 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -7,7 +7,7 @@ @unnumbered Installation Instructions Copyright @copyright{} 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, -2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -242,7 +242,8 @@ which has the form: where @var{system} can have one of these forms: @example -@var{os} @var{kernel}-@var{os} +@var{os} +@var{kernel}-@var{os} @end example See the file @file{config.sub} for the possible values of each field. hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 17 17:00:51 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LjgP5-0006ct-12 for mharc-autoconf-commit@gnu.org; Tue, 17 Mar 2009 17:00:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LjgP2-0006bY-Md for autoconf-commit@gnu.org; Tue, 17 Mar 2009 17:00:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LjgP1-0006af-Dl for autoconf-commit@gnu.org; Tue, 17 Mar 2009 17:00:47 -0400 Received: from [199.232.76.173] (port=51943 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LjgP1-0006aZ-6l for autoconf-commit@gnu.org; Tue, 17 Mar 2009 17:00:47 -0400 Received: from savannah.gnu.org ([199.232.41.3]:47412 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LjgP0-0006K2-Nj for autoconf-commit@gnu.org; Tue, 17 Mar 2009 17:00:46 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LjgOv-0003kM-Oc for autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:00:43 +0000 Received: from meyering by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LjgOh-0003jJ-5A for autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:00:41 +0000 From: "Jim Meyering" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: efb3e8a738994924dfed0e1d73c91e0678622b3b X-Git-Newrev: 8a54ca8043e5a4cb685d755fd10b78d75f16293e Message-Id: Date: Tue, 17 Mar 2009 21:00:36 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-292-g8a54ca8 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Mar 2009 21:00:49 -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=8a54ca8043e5a4cb685d755fd10b78d75f16293e The branch, master has been updated via 8a54ca8043e5a4cb685d755fd10b78d75f16293e (commit) from efb3e8a738994924dfed0e1d73c91e0678622b3b (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 8a54ca8043e5a4cb685d755fd10b78d75f16293e Author: Jim Meyering Date: Mon Aug 18 11:08:14 2008 +0200 Manual: fix a typo. * lib/m4sugar/m4sh.m4: s/are/is/ => "there is no indirection" ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ lib/m4sugar/m4sh.m4 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05e3a4d..259004e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-03-17 Jim Meyering + + Manual: fix a typo. + * lib/m4sugar/m4sh.m4: s/are/is/ => "there is no indirection" + 2009-03-17 Eric Blake Use test consistently in examples. diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index d8ef957..88881b1 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -1892,8 +1892,8 @@ m4_define([AS_VAR_COPY], # AS_VAR_GET(VARIABLE) # -------------------- # Get the value of the shell VARIABLE. -# Evaluates to $VARIABLE if there are no indirection in VARIABLE, -# else into the appropriate `eval' sequence. +# Evaluates to $VARIABLE if there is no indirection in VARIABLE, +# else to the appropriate `eval' sequence. # This macro is deprecated because it sometimes mishandles trailing newlines; # use AS_VAR_COPY instead. m4_define([AS_VAR_GET], hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 17 21:34:40 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Ljkg4-0007nK-34 for mharc-autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:34:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ljkg2-0007mo-KS for autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:34:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ljkg1-0007mL-JX for autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:34:37 -0400 Received: from [199.232.76.173] (port=49139 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ljkg1-0007mF-Bs for autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:34:37 -0400 Received: from savannah.gnu.org ([199.232.41.3]:51395 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ljkg1-0000AD-2K for autoconf-commit@gnu.org; Tue, 17 Mar 2009 21:34:37 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ljkg0-0006tq-EG for autoconf-commit@gnu.org; Wed, 18 Mar 2009 01:34:36 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Ljkfz-0006tM-I4 for autoconf-commit@gnu.org; Wed, 18 Mar 2009 01:34:36 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8a54ca8043e5a4cb685d755fd10b78d75f16293e X-Git-Newrev: abee382683d1b977f2ab4a91121b4277045e6d5a Message-Id: Date: Wed, 18 Mar 2009 01:34:35 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-293-gabee382 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2009 01:34:39 -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=abee382683d1b977f2ab4a91121b4277045e6d5a The branch, master has been updated via abee382683d1b977f2ab4a91121b4277045e6d5a (commit) from 8a54ca8043e5a4cb685d755fd10b78d75f16293e (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 abee382683d1b977f2ab4a91121b4277045e6d5a Author: Eric Blake Date: Tue Mar 17 19:33:08 2009 -0600 Manual: mention more expr pitfalls. * doc/autoconf.texi (Limitations of Usual Tools) : Mention HP-UX limitation, and $ ambiguity. * THANKS: Update. Reported by Jens Schmidt, in http://bugs.debian.org/466990. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++++++ THANKS | 1 + doc/autoconf.texi | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 259004e..3829924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-18 Eric Blake + + Manual: mention more expr pitfalls. + * doc/autoconf.texi (Limitations of Usual Tools) : + Mention HP-UX limitation, and $ ambiguity. + * THANKS: Update. + Reported by Jens Schmidt, in http://bugs.debian.org/466990. + 2009-03-17 Jim Meyering Manual: fix a typo. diff --git a/THANKS b/THANKS index c3e19a2..8d8bb37 100644 --- a/THANKS +++ b/THANKS @@ -164,6 +164,7 @@ Jeffrey A Law law@cygnus.com Jeffrey J. Barteet ? Jennis Pruett ? Jens Petersen petersen@redhat.com +Jens Schmidt jens.schmidt35@arcor.de Jeremy Yallop jeremy@yallop.org Jerker Bäck jerker.back@home.se Jim Blandy jimb@wookumz.gnu.ai.mit.edu diff --git a/doc/autoconf.texi b/doc/autoconf.texi index a0a19b8..a4cb0d1 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -16642,6 +16642,21 @@ Portable @command{expr} regular expressions should not begin with @samp{^}. Patterns are automatically anchored so leading @samp{^} is not needed anyway. +On the other hand, the behavior of the @samp{$} anchor is not portable +on multi-line strings. Posix is ambiguous whether the anchor applies to +each line, as was done in older versions of @acronym{GNU} Coreutils, or +whether it applies only to the end of the overall string, as in +Coreutils 6.0 and most other implementations. + +@example +$ @kbd{baz='foo} +> @kbd{bar'} +$ @kbd{expr "X$baz" : 'X\(foo\)$'} + +$ @kbd{expr-5.97 "X$baz" : 'X\(foo\)$'} +foo +@end example + The Posix standard is ambiguous as to whether @samp{expr 'a' : '\(b\)'} outputs @samp{0} or the empty string. In practice, it outputs the empty string on most platforms, but portable @@ -16718,6 +16733,14 @@ $ @kbd{expr 00001 : '.*\(...\)'} 1 @end example +On @acronym{HP-UX} 11, @command{expr} only supports a single +sub-expression. + +@example +$ @kbd{expr 'Xfoo' : 'X\(f\(oo\)*\)$'} +expr: More than one '\(' was used. +@end example + @item @command{fgrep} @c ------------------ hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 24 08:02:47 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Lm5LD-000844-BY for mharc-autoconf-commit@gnu.org; Tue, 24 Mar 2009 08:02:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lm5LB-000830-0D for autoconf-commit@gnu.org; Tue, 24 Mar 2009 08:02:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lm5L8-00081Z-M3 for autoconf-commit@gnu.org; Tue, 24 Mar 2009 08:02:43 -0400 Received: from [199.232.76.173] (port=54083 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lm5L8-00081Q-Fu for autoconf-commit@gnu.org; Tue, 24 Mar 2009 08:02:42 -0400 Received: from savannah.gnu.org ([199.232.41.3]:41943 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lm5L7-0005Hs-Rd for autoconf-commit@gnu.org; Tue, 24 Mar 2009 08:02:42 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Lm5L7-0004P5-2r for autoconf-commit@gnu.org; Tue, 24 Mar 2009 12:02:41 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Lm5L4-0004OW-Je for autoconf-commit@gnu.org; Tue, 24 Mar 2009 12:02:40 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: abee382683d1b977f2ab4a91121b4277045e6d5a X-Git-Newrev: dbcfd3b29f339ac0ca2f18685258c02b0e45889c Message-Id: Date: Tue, 24 Mar 2009 12:02:40 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-294-gdbcfd3b X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2009 12:02:45 -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=dbcfd3b29f339ac0ca2f18685258c02b0e45889c The branch, master has been updated via dbcfd3b29f339ac0ca2f18685258c02b0e45889c (commit) from abee382683d1b977f2ab4a91121b4277045e6d5a (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 dbcfd3b29f339ac0ca2f18685258c02b0e45889c Author: Eric Blake Date: Tue Mar 24 05:58:52 2009 -0600 Fix underquoted example in manual. * doc/autoconf.texi (Common Shell Constructs) : Properly m4-quote #. * THANKS: Update spelling. Reported by Matěj Týč. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 8 ++++++++ THANKS | 2 +- doc/autoconf.texi | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3829924..f6b82e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-24 Eric Blake + + Fix underquoted example in manual. + * doc/autoconf.texi (Common Shell Constructs) : + Properly m4-quote #. + * THANKS: Update spelling. + Reported by Matěj Týč. + 2009-03-18 Eric Blake Manual: mention more expr pitfalls. diff --git a/THANKS b/THANKS index 8d8bb37..6c9da3b 100644 --- a/THANKS +++ b/THANKS @@ -232,7 +232,7 @@ Martin Koeppe mkoeppe@gmx.de Martin Mokrejs mmokrejs@natur.cuni.cz Martin Wilck martin@tropos.de Martyn Johnson Martyn.Johnson@cl.cam.ac.uk -Matej Tyc matej.tyc@gmail.com +Matěj Týč matej.tyc@gmail.com Matteo Frigo ? Matthew D. Langston langston@SLAC.Stanford.EDU Matthew Mueller donut@azstarnet.com diff --git a/doc/autoconf.texi b/doc/autoconf.texi index a4cb0d1..5e490fe 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -12451,8 +12451,9 @@ For example: @example # This outputs "#define HAVE_CHAR_P 1". +# Notice the m4 quoting around #, to prevent an m4 comment type="char *" -echo "#define AS_TR_CPP([HAVE_$type]) 1" +echo "[#]define AS_TR_CPP([HAVE_$type]) 1" @end example @end defmac hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Wed Mar 25 08:24:36 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LmS9s-0005i9-9D for mharc-autoconf-commit@gnu.org; Wed, 25 Mar 2009 08:24:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LmS9p-0005eb-Mz for autoconf-commit@gnu.org; Wed, 25 Mar 2009 08:24:33 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LmS9o-0005co-LS for autoconf-commit@gnu.org; Wed, 25 Mar 2009 08:24:33 -0400 Received: from [199.232.76.173] (port=41304 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LmS9o-0005cT-Fw for autoconf-commit@gnu.org; Wed, 25 Mar 2009 08:24:32 -0400 Received: from savannah.gnu.org ([199.232.41.3]:48293 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LmS9o-00061g-5c for autoconf-commit@gnu.org; Wed, 25 Mar 2009 08:24:32 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LmS9n-0000rd-8r for autoconf-commit@gnu.org; Wed, 25 Mar 2009 12:24:31 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LmS9m-0000r2-6B for autoconf-commit@gnu.org; Wed, 25 Mar 2009 12:24:31 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: dbcfd3b29f339ac0ca2f18685258c02b0e45889c X-Git-Newrev: bc9bc82a1e5615c6a7bca8bb9800427ac73625ce Message-Id: Date: Wed, 25 Mar 2009 12:24:30 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-296-gbc9bc82 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2009 12:24:34 -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=bc9bc82a1e5615c6a7bca8bb9800427ac73625ce The branch, master has been updated via bc9bc82a1e5615c6a7bca8bb9800427ac73625ce (commit) via 60e637d68fd3f8595894e7b8155150893e928069 (commit) from dbcfd3b29f339ac0ca2f18685258c02b0e45889c (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 bc9bc82a1e5615c6a7bca8bb9800427ac73625ce Author: Andris Pavenis Date: Tue Mar 24 06:47:09 2009 -0600 Fix awk substitution of carriage returns on DJGPP. * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix typo in generation of ac_cs_awk_cr. * THANKS: Update. Signed-off-by: Eric Blake commit 60e637d68fd3f8595894e7b8155150893e928069 Author: Aaron W. LaFramboise Date: Sun Mar 22 01:06:58 2009 -0500 Work around cygwin bash igncr mode. * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fall back to bash carriage returns if ac_cr lost \r from ``. * THANKS: Update. Suggested by Eric Blake. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 15 +++++++++++++++ THANKS | 2 ++ lib/autoconf/status.m4 | 8 +++++++- 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6b82e5..b565525 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2009-03-24 Andris Pavenis (tiny change) + + Fix awk substitution of carriage returns on DJGPP. + * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fix typo in + generation of ac_cs_awk_cr. + * THANKS: Update. + +2009-03-24 Aaron W. LaFramboise (tiny change) + + Work around cygwin bash igncr mode. + * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Fall back to + bash carriage returns if ac_cr lost \r from ``. + * THANKS: Update. + Suggested by Eric Blake. + 2009-03-24 Eric Blake Fix underquoted example in manual. diff --git a/THANKS b/THANKS index 6c9da3b..77da1dd 100644 --- a/THANKS +++ b/THANKS @@ -9,6 +9,7 @@ contributions significant enough to warrant copyright assignment. Aaron Crane aaronc@pobox.com Aaron M. Ucko amu@alum.mit.edu +Aaron W. LaFramboise aaronenvelope277@aaronwl.com Adam J. Richter adam@yggdrasil.com Aharon Robbins arnold@gnu.org Akim Demaille akim@freefriends.org @@ -33,6 +34,7 @@ Andrej Borsenkow borsenkow.msk@sni.de Andrew Belov ? Andrew Church achurch@achurch.org Andrey Simonenko simon@comsys.ntu-kpi.kiev.ua +Andris Pavenis andris.pavenis@iki.fi Anthony N. Frasso afrasso@yahoo.com Art Haas ahaas@neosoft.com Arto C. Nirkko ? diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index 6e5a904..72e6893 100644 --- a/lib/autoconf/status.m4 +++ b/lib/autoconf/status.m4 @@ -377,9 +377,15 @@ else ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }' fi]]) ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 31 00:09:32 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LoVI4-0004yy-El for mharc-autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:09:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LoVI2-0004yB-M7 for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:09:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LoVI2-0004xz-1U for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:09:30 -0400 Received: from [199.232.76.173] (port=49481 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LoVI1-0004xw-Um for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:09:29 -0400 Received: from savannah.gnu.org ([199.232.41.3]:48210 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LoVI1-0002la-IT for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:09:29 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LoVI0-0008TS-Vl for autoconf-commit@gnu.org; Tue, 31 Mar 2009 04:09:29 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LoVHx-0008Sv-KX for autoconf-commit@gnu.org; Tue, 31 Mar 2009 04:09:28 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bc9bc82a1e5615c6a7bca8bb9800427ac73625ce X-Git-Newrev: d46e5d684417412e6fb89dcb7fd1a76010618c63 Message-Id: Date: Tue, 31 Mar 2009 04:09:28 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-297-gd46e5d6 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2009 04:09: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=d46e5d684417412e6fb89dcb7fd1a76010618c63 The branch, master has been updated via d46e5d684417412e6fb89dcb7fd1a76010618c63 (commit) from bc9bc82a1e5615c6a7bca8bb9800427ac73625ce (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 d46e5d684417412e6fb89dcb7fd1a76010618c63 Author: Eric Blake Date: Mon Mar 30 08:11:09 2009 -0600 For now, skip parallel tests under less-tested shells. * tests/autotest.at (AT_CHECK_AT): Add pre-test argument. (Tested programs, Startup error messages, AT_CHECK_AT_TITLE) (Fallacy, Skip, errexit, Long test source lines) (Debugging a successful test, Debugging script and environment) (Debugging a failed test, Using atlocal) (Choosing where testsuite is run): Adjust callers. (AT_SKIP_PARALLEL_TESTS): New macro, to skip parallel tests except under zsh, bash, or when TEST_PARALLEL_AUTOTEST is defined. Makes it easier to avoid testsuite hangs for users with dash or other less-tested shell. (parallel test execution, parallel truth, parallel fallacy) (parallel skip, parallel errexit) (parallel autotest and signal handling): Use it. * BUGS: Mention this. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: BUGS | 16 ++++++++++--- ChangeLog | 18 +++++++++++++++ tests/autotest.at | 64 ++++++++++++++++++++++++++++++++-------------------- 3 files changed, 69 insertions(+), 29 deletions(-) diff --git a/BUGS b/BUGS index b2ca081..1d32e50 100644 --- a/BUGS +++ b/BUGS @@ -3,7 +3,7 @@ This file lists the bugs you must be aware of. Be sure to check this file before using Autoconf, and especially git versions of Autoconf. - Copyright (C) 2000-2002, 2006-2008 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2006-2009 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 @@ -32,6 +32,14 @@ and use with caution an Autoconf with ``Important bugs''. configure scripts may fail to run on old platforms that lack a shell with proper function support. -* Cygwin has known problems with named fifos that cause failures when - attempting parallel tests in an autotest suite. It is possible that - other platforms also have difficulty with parallel testing. +* Autotest parallel testsuite support is still a work in progress. + There are known issues in job handling under dash and some ksh + variants, where a parallel testsuite can hang or cause a 100% + processor load. In the current release, the overall autoconf + testsuite only exercises parallel autotest under bash and zsh, or if + you have defined TEST_PARALLEL_AUTOTEST in the environment. + Meanwhile, Cygwin has known problems with named fifos that cause + failures when attempting parallel tests in an autotest suite. It is + possible that other difficulties will be encountered, whether with + shell or platform limitations; help is appreciated in improving + parallel testsuite support. diff --git a/ChangeLog b/ChangeLog index b565525..43a2f56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2009-03-30 Eric Blake + + For now, skip parallel tests under less-tested shells. + * tests/autotest.at (AT_CHECK_AT): Add pre-test argument. + (Tested programs, Startup error messages, AT_CHECK_AT_TITLE) + (Fallacy, Skip, errexit, Long test source lines) + (Debugging a successful test, Debugging script and environment) + (Debugging a failed test, Using atlocal) + (Choosing where testsuite is run): Adjust callers. + (AT_SKIP_PARALLEL_TESTS): New macro, to skip parallel tests except + under zsh, bash, or when TEST_PARALLEL_AUTOTEST is defined. Makes + it easier to avoid testsuite hangs for users with dash or other + less-tested shell. + (parallel test execution, parallel truth, parallel fallacy) + (parallel skip, parallel errexit) + (parallel autotest and signal handling): Use it. + * BUGS: Mention this. + 2009-03-24 Andris Pavenis (tiny change) Fix awk substitution of carriage returns on DJGPP. diff --git a/tests/autotest.at b/tests/autotest.at index 576eb80..1ed19a6 100644 --- a/tests/autotest.at +++ b/tests/autotest.at @@ -2,8 +2,8 @@ AT_BANNER([Autotest.]) -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, -# Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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 @@ -62,24 +62,26 @@ m4_popdef([AT_dir])dnl ]) # AT_CHECK_AT_PREP # AT_CHECK_AT(TITLE, SUITE-CODE, [XFAIL-CONDITION], [STATUS = 0], -# [STDOUT = ignore], STDERR, [POST-TEST-CODE], [SUITE-ARGS]) -# ---------------------------------------------------------------------- +# [STDOUT = ignore], STDERR, [PRE-TEST-CODE], +# [POST-TEST-CODE], [SUITE-ARGS]) +# --------------------------------------------------------------- # Create a new test named TITLE that runs a minimal Autotest test suite, # SUITE-CODE with additional SUITE-ARGS, once without and once with # '-v -x' added. Call AT_XFAIL_IF with XFAIL-CONDITION. Pass STDERR # directly to the AT_CHECK that calls the minimal test suite, STDOUT to # the AT_CHECK without '-v -x'; ignore stdout for the latter. -# Run POST-TEST-CODE at the top level after the micro-suite has been run. +# Run PRE-TEST-CODE at the top level after the micro-suite is created, but +# before it is run, and POST-TEST-CODE after the micro-suite has been run. m4_define([AT_CHECK_AT], [AT_SETUP([$1]) AT_XFAIL_IF([$3]) AT_CHECK_AT_PREP([micro-suite], [$2]) - -AT_CHECK([$CONFIG_SHELL ./micro-suite $8], m4_default([$4], 0), +$7 +AT_CHECK([$CONFIG_SHELL ./micro-suite $9], m4_default([$4], 0), m4_default([$5], [ignore]), [$6]) -AT_CHECK([$CONFIG_SHELL ./micro-suite -v -x $8], m4_default([$4], 0), +AT_CHECK([$CONFIG_SHELL ./micro-suite -v -x $9], m4_default([$4], 0), [ignore], [$6]) -$7 +$8 AT_CLEANUP ])# AT_CHECK_AT @@ -220,7 +222,7 @@ AT_CHECK_AT([Tested programs], [[AT_INIT([programs test suite]) AT_TESTED([autoconf autom4te]) AT_TESTED([autoconf]) -]], [], [], [], [], +]], [], [], [], [], [], [AT_CHECK([[sed -n 's|.*/\([^ /]* --version\)|\1|p' micro-suite.log]], [], [[autoconf --version autom4te --version @@ -231,7 +233,7 @@ AT_CHECK_AT([Startup error messages], AT_SETUP([only test]) AT_CHECK([:]) AT_CLEANUP -]], [], [], [], [], +]], [], [], [], [], [], [AT_CHECK([sed -n '/exec AS_MESSAGE_LOG_FD/q; />&AS_MESSAGE_LOG_FD/p' < micro-suite])]) ## ----------------------------------------------------- ## @@ -243,12 +245,12 @@ AT_CHECK_AT_TEST([Truth], AT_CHECK_AT_TEST([Fallacy], [AT_CHECK([false], [], [], [])], - [], [1], [], [ignore], + [], [1], [], [ignore], [], [AT_CHECK([grep failed micro-suite.log], [], [ignore])]) AT_CHECK_AT_TEST([Skip], [AT_CHECK([exit 77], 0, [], [])], - [], [], [], [], + [], [], [], [], [], [AT_CHECK([grep skipped micro-suite.log], [], [ignore])]) AT_CHECK_AT_TEST([errexit], @@ -256,7 +258,7 @@ AT_CHECK_AT_TEST([errexit], AT_CLEANUP AT_SETUP([test that should not be run]) AT_CHECK([:])], - [], [1], [stdout], [stderr], + [], [1], [stdout], [stderr], [], [AT_CHECK([test -f micro-suite.log], [1]) touch micro-suite.log # shut up AT_CAPTURE_FILE. AT_CHECK([grep "should not be run" stdout], [1]) @@ -436,7 +438,7 @@ AT_INIT([artificial test suite]) AT_SETUP([$2]) AT_CHECK([:]) AT_CLEANUP -]], [$4], [], [], [], +]], [$4], [], [], [], [], dnl This sed script checks for two things - that the output is properly dnl expanded, and that the 'ok' starts on the right column. [AT_KEYWORDS([m4@&t@_expand]) @@ -505,7 +507,7 @@ AT_CHECK_AT_TITLE_CHAR([Longer test title], AT_CHECK_AT_TEST([Long test source lines], [m4_for([nnn], [1], [999], [], [: ]) AT_CHECK([:]) -], [], [], [], [ignore], +], [], [], [], [ignore], [], [AT_CHECK([$CONFIG_SHELL ./micro-suite -k skipalltests], [], [ignore], [ignore]) ]) @@ -515,7 +517,7 @@ AT_CHECK([:]) ## ----------------- ## AT_CHECK_AT_TEST([Debugging a successful test], - [AT_CHECK([:])], [], [], [], [ignore], + [AT_CHECK([:])], [], [], [], [ignore], [], [# Without options, when all tests pass, no test directory should exist. AT_CHECK([test -d micro-suite.dir/1 && exit 42 $CONFIG_SHELL ./micro-suite -d 1], [], [ignore], [ignore]) @@ -530,7 +532,7 @@ AT_CHECK([(cd micro-suite.dir/1 && ./run)], [], [ignore], [ignore]) AT_CHECK_AT_TEST([Debugging script and environment], [AT_CHECK([test "$MY_VAR" = pass || exit 42])], - [], [1], [], [ignore], [ + [], [1], [], [ignore], [], [ # Changing environment outside of debugging script is not preserved. AT_CHECK([(cd micro-suite.dir/1 && MY_VAR=pass ./run)], [0], [ignore], [ignore]) @@ -547,7 +549,7 @@ AT_CHECK([(cd micro-suite.dir/1; ./run)], # in via an environment option. AT_CHECK_AT_TEST([Debugging a failed test], [AT_CHECK([test "$MY_VAR" = "one space" || exit 42])], - [], [1], [], [ignore], [ + [], [1], [], [ignore], [], [ AT_CHECK([(cd micro-suite.dir/1 && ./run MY_VAR='two spaces')], [1], [ignore], [ignore]) AT_CHECK([(cd micro-suite.dir/1 && ./run MY_VAR='one space')], @@ -558,7 +560,7 @@ AT_CHECK([(cd micro-suite.dir/1 && ./run MY_VAR='one space')], # Setting default variable values via atlocal. AT_CHECK_AT_TEST([Using atlocal], [AT_CHECK([test "x$MY_VAR" = "xodd; 'string" || exit 42])], - [], [1], [ignore], [ignore], [ + [], [1], [ignore], [ignore], [], [ dnl check that command line can set variable AT_CHECK([$CONFIG_SHELL ./micro-suite MY_VAR="odd; 'string"], [0], [ignore]) dnl check that command line overrides environment @@ -592,7 +594,7 @@ AT_CHECK([$CONFIG_SHELL ./micro-suite 1=2], [1], [], [ignore], [ignore]) # Controlling where the testsuite is run. AT_CHECK_AT_TEST([Choosing where testsuite is run], - [AT_CHECK([:])], [], [], [], [], [ + [AT_CHECK([:])], [], [], [], [], [], [ dnl AT_CHECK_AT_TEST tests the default of running in `.'. AT_CHECK([$CONFIG_SHELL ./micro-suite --clean]) AT_CHECK([test -f micro-suite.log], [1]) @@ -816,6 +818,14 @@ AT_CHECK_KEYS([-l], [.{80}], [1], [.{87}], [0]) AT_CLEANUP +m4_define([AT_SKIP_PARALLEL_TESTS], +[# Per BUGS, we have not yet figured out how to run parallel tests cleanly +# under dash and some ksh variants. For now, only run this test under +# limited conditions; help is appreciated in widening this test base. +AT_CHECK([test -n "${BASH_VERSION+set}${ZSH_VERSION+set}]]dnl +[[${TEST_PARALLEL_AUTOTEST+set}" || exit 77]) +]) + ## ----------------------- ## ## parallel test execution ## @@ -823,6 +833,8 @@ AT_CLEANUP AT_SETUP([parallel test execution]) +AT_SKIP_PARALLEL_TESTS + # This test tries to ensure that -j runs tests in parallel. # Such a test is inherently racy, because there are no real-time # guarantees about scheduling delays. So we try to minimize @@ -912,17 +924,17 @@ AT_CLEANUP AT_CHECK_AT_TEST([parallel truth], [AT_CHECK([:], 0, [], [])], - [], [], [], [], + [], [], [], [], [AT_SKIP_PARALLEL_TESTS], [], [-j]) AT_CHECK_AT_TEST([parallel fallacy], [AT_CHECK([false], [], [], [])], - [], [1], [], [ignore], + [], [1], [], [ignore], [AT_SKIP_PARALLEL_TESTS], [AT_CHECK([grep failed micro-suite.log], [], [ignore])], [-j]) AT_CHECK_AT_TEST([parallel skip], [AT_CHECK([exit 77], 0, [], [])], - [], [], [], [], + [], [], [], [], [AT_SKIP_PARALLEL_TESTS], [AT_CHECK([grep skipped micro-suite.log], [], [ignore])], [-j]) AT_CHECK_AT_TEST([parallel errexit], @@ -933,7 +945,7 @@ AT_CHECK_AT_TEST([parallel errexit], AT_CLEANUP AT_SETUP([test that should not be run]) AT_CHECK([:])], - [], [1], [stdout], [stderr], + [], [1], [stdout], [stderr], [AT_SKIP_PARALLEL_TESTS], [AT_CHECK([test -f micro-suite.log], [1]) touch micro-suite.log # shut up AT_CAPTURE_FILE. AT_CHECK([grep "should not be run" stdout], [1]) @@ -943,6 +955,8 @@ AT_CHECK_AT_TEST([parallel errexit], AT_SETUP([parallel autotest and signal handling]) +AT_SKIP_PARALLEL_TESTS + # Goals: # (1) interrupt `./testsuite -jN' # (2) interrupt `make check TESTSUITEFLAGS=-jN' hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 31 00:18:37 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LoVQr-0000Il-Oz for mharc-autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:18:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LoVQp-0000Hn-KE for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:18:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LoVQo-0000HS-T9 for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:18:35 -0400 Received: from [199.232.76.173] (port=48064 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LoVQo-0000HJ-NL for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:18:34 -0400 Received: from savannah.gnu.org ([199.232.41.3]:59764 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LoVQo-00068a-Gk for autoconf-commit@gnu.org; Tue, 31 Mar 2009 00:18:34 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LoVQn-0000uh-JD for autoconf-commit@gnu.org; Tue, 31 Mar 2009 04:18:33 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LoVQj-0000u2-CR for autoconf-commit@gnu.org; Tue, 31 Mar 2009 04:18:33 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d46e5d684417412e6fb89dcb7fd1a76010618c63 X-Git-Newrev: e7399cdcce9ef10d80bd010376c706358adf6fe5 Message-Id: Date: Tue, 31 Mar 2009 04:18:32 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63-298-ge7399cd X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2009 04:18:35 -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=e7399cdcce9ef10d80bd010376c706358adf6fe5 The branch, master has been updated via e7399cdcce9ef10d80bd010376c706358adf6fe5 (commit) from d46e5d684417412e6fb89dcb7fd1a76010618c63 (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 e7399cdcce9ef10d80bd010376c706358adf6fe5 Author: Eric Blake Date: Mon Mar 30 13:28:02 2009 -0600 Fix testsuite failures under zsh. * tests/local.at (AT_CHECK_ENV): Exempt $argv and $ARGC, which are set by zsh -c 'emulate sh'. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ tests/local.at | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43a2f56..ac19a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-03-30 Eric Blake + Fix testsuite failures under zsh. + * tests/local.at (AT_CHECK_ENV): Exempt $argv and $ARGC, which are + set by zsh -c 'emulate sh'. + Reported by Ralf Wildenhues. + For now, skip parallel tests under less-tested shells. * tests/autotest.at (AT_CHECK_AT): Add pre-test argument. (Tested programs, Startup error messages, AT_CHECK_AT_TITLE) diff --git a/tests/local.at b/tests/local.at index dffeebf..fd451d1 100644 --- a/tests/local.at +++ b/tests/local.at @@ -295,7 +295,7 @@ m4_define([AT_CHECK_CONFIGURE], # Set by AC_OUTPUT. # - AC_SUBST'ed variables # (FIXME: Generate a list of these automatically.) -# - _|@|.[*#?$].|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS +# - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS # Some variables some shells use and change. # `.[*#?$].' catches `$#' etc. which are displayed like this: # | '!'=18186 @@ -330,7 +330,8 @@ if test -f state-env.before && test -f state-env.after; then [ALLOCA|GETLOADAVG_LIBS|KMEM_GROUP|NEED_SETGID|POW_LIB], [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC], [GREP|[EF]GREP|SED], - [[_@]|.[*#?$].|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ + [[_@]|.[*#?$].], + [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ $act_file 2>/dev/null | # There may be variables spread on several lines; remove latter lines. $GREP '^m4_defn([m4_re_word])=' >clean-$act_file hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 31 08:39:44 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LodFo-00058x-IV for mharc-autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LodFh-00055O-Hn for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LodFg-00053g-68 for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:36 -0400 Received: from [199.232.76.173] (port=59291 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LodFe-00053H-Cf for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:34 -0400 Received: from savannah.gnu.org ([199.232.41.3]:38163 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LodFd-0004zP-Sg for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:34 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LodFd-00013h-Eg for autoconf-commit@gnu.org; Tue, 31 Mar 2009 12:39:33 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LodFb-00010Y-DY for autoconf-commit@gnu.org; Tue, 31 Mar 2009 12:39:33 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/tags/v2.63b X-Git-Reftype: annotated tag X-Git-Oldrev: 0000000000000000000000000000000000000000 X-Git-Newrev: e9b72a1dd2f35358c67bf76a06f3795c654f5a75 Message-Id: Date: Tue, 31 Mar 2009 12:39:31 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository annotated tag, v2.63b, created. v2.63b X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2009 12:39:39 -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=e9b72a1dd2f35358c67bf76a06f3795c654f5a75 The annotated tag, v2.63b has been created at e9b72a1dd2f35358c67bf76a06f3795c654f5a75 (tag) tagging ddbb239f1221935fb90768b2e21986713518adf2 (commit) replaces v2.63 tagged by Eric Blake on Tue Mar 31 06:02:43 2009 -0600 - Log ----------------------------------------------------------------- 2.63b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg iEYEABECAAYFAknSBmMACgkQ84KuGfSFAYDjuACgz+TkBuc2nIRsr7RJsXwsbLx4 sYQAoImJ5WJMipU+9kaf0FawLEJOqT6G =ZH0+ -----END PGP SIGNATURE----- Aaron W. LaFramboise (1): Work around cygwin bash igncr mode. Alfred G. de Wijn (1): For consistency, make temporary variable match language name. Allan Caffee (1): Fix a typo in comment for AS_LITERAL_IF. Andris Pavenis (1): Fix awk substitution of carriage returns on DJGPP. Bruno Haible (5): Warn about /usr/ucb on Solaris. Mention Sun WorkShop 6.2 OpenMP bug. Improve INSTALL for Haiku. Improve INSTALL for HP-UX. Improve multiarch detection. Chikama Masaki (1): For gfortran on sh, ignore -little. Clinton Roy (1): Pass autoreconf -I to aclocal -I Eric Blake (198): ./.prev-version: Record previous version: 2.63. Avoid testsuite bug in presence of verbose config.site. Avoid testsuite bug when autom4te cache is disabled by user. Fix Erlang regression, introduced 2006-11-17. Fix sample isinf definition. ChangeLog for previous commit. Document more binary file portability traps. Fix build with case-insensitive make, again. Add m4_default_quoted. Fix m4 quoting in previous patch. Improve m4sh maintainability. Ensure _AS_CLEANUP is defined. Avoid repeating required shell tests in suggested set. Resync from gnulib. Only prepare $as_me if it will be used. Fix _AS_MKDIR_P usage. Use consistent shell function style. Document shell function environment pitfall. Correct previous patch. Cleanups to previous patches. Break circular require chain in _AS_LINENO_PREPARE. Speed up m4_qlen with caching. Add AS_FUNCTION_DESCRIBE. Allow comments before functions emitted by m4sh. Sort AS_VAR_* interfaces. Add AS_VAR_COPY. Test AS_VAR interfaces. Document AS_VAR interfaces. Reduce vertical whitespace in configure. Document m4_map_args. Add m4_set_map. Improve suggested test filtering. Add m4_curry. Fix some testsuite failures introduced two days ago. Document bugs in { } handling. Avoid unportable use of echo in testsuite. Add banners to generated files. Add banners to generated files. Add AS_VAR_APPEND. Use AS_VAR_APPEND. Allow AS_IF in shell lists. Allow AS_CASE in shell lists. Allow AS_VAR_IF in shell lists. Allow AS_VAR_SET_IF in shell lists. Improve wording related to automake and autotest. Fix testsuite failure. Fix autoconf logging commands. Formatting tweak: balance () with m4sh case statements. Remove excess dnl from m4sh. Whitespace cleanup. AC_FUNC_GETGROUPS: Revert regression. Improve m4_copy. Optimize clients of AS_REQUIRE. Make m4_defun_init more robust. Work around fact that gnulib-tool doesn't use m4_copy. Speed up AC_CHECK_HEADER. Fix m4 underquoting in AC_PROG_INSTALL. Use AS_EXIT in autoconf.as. Document AS_EXIT. Simplify _AS_PREPARE handling of functions. Track recent copyright assignments. Use read, rather than `cat`, for safe one-line files. Add AS_VAR_ARITH. Use AS_VAR_ARITH. Avoid raw carriage return in scripts. Prefer m4_fatal over AC_FATAL. Allow m4sugar to be used without autom4te, such as in bison. Override m4 1.4.x dumpdef, as it breaks autom4te. Use m4_map_args in more places. Undo needless efforts to protect $2 in $2_t. Reduce forks while searching for better shell. Add m4_stack_foreach_sep. Use _m4_stack_reverse in m4_set. Alter signature of AS_INIT_GENERATED. Document current beta-quality status. Mention proper fix for zsh users. Fix LINENO detection to work around bash and pdksh limitations. Work around Solaris /bin/sh case bug. Don't check for non-POSIX extensions in suggested tests. Update LINENO documentation. Fix LINENO testsuite failure. Better documentation of AC_CHECK_HEADER's fourth argument. Simplify expansion stack handling. Simplify diversion stack handling. Support multiple undiverts and dumpdefs at once. Upgrade to FDL 1.3. Reject arguments with leading =. Reject arguments with leading =; test previous patch. Adjust expected output. Improve m4_for performance. Add m4_map_args_sep, undocumented for now. Unify _m4_foreach and _m4_map. Use _m4_foreach in more places. Unify m4_set_foreach and m4_set_map. Use m4_set_map_sep in more places. Add m4_map_args_w. Speed up AC_CHECK_TYPE. Skip preprocessor check in AC_CHECK_HEADERS_ONCE. Use UTF-8 in ChangeLog. Further doc updates for AC_CHECK_HEADER change. Provide a section on all tools allowed in GNU Coding Standards. Try 'print -r --' as a non-forking variant of 'printf %s\\n'. More FDL 1.3 fallout. Use more efficient macro in AT_INIT. Use more efficient macros in AC_CHECK_FUNCS. Use more efficient macros in AC_CHECK_HEADERS. Use more efficient macros in AC_CHECK_TYPES. Use more efficient macros in AC_CHECK_FILES and AC_CHECK_DECLS. Use more efficient macros in AC_CONFIG_SUBDIRS. Avoid some regex uses. Yet more FDL 1.3 fallout. Match upstream standards.texi. Work around <=m4-1.4.9 bug in m4_format. Make M4sh, not autoconf, guarantee sane $SHELL. Whitespace reduction in configure. Fix AS_ESCAPE usage bugs. Optimize single-argument loop. Add AS_FOR, undocumented for now. Use the new AS_FOR function. Detect empty list in AS_FOR. Document a Solaris /bin/sh bug with 'set -e'. Document Tru64 bug with 'set -e'. Add AS_SET_STATUS, make AS_EXIT more efficient. Update example to match actual Tru64 behavior. Alter default value of AS_EXIT. Use fn for shell functions, func for autoconf CHECK_FUNCS. Improve testsuite generation. Speed up _AS_QUOTE. Describe different hacks for balancing ')' in case statements. Remove _m4_index. Add m4_chomp, m4_esyscmd_s. Improve m4_expand robustness, part 1. Improve m4_expand robustness, part 2. Reduce forks in AC_DEFINE. Fix XFAIL related to AT_CHECK. Speed up AT_CHECK. Handle version numbers as decimal, even if they start with 0. Factor more common code out of AT_CHECK into shell function. Move case statement style discussion to m4 quoting section. Add @anchors within Builtins and Usual Tools lists. Change the semantics of AS_EXIT without argument. Use modern m4sh constructs in autoconf. Fix typos in recent testsuite improvements. Use shell function for AS_ERROR. Clean up AS_MESSAGE_LOG_FD usage. Fix testsuite failure on Solaris. Fix typo in AS_MESSAGE_LOG_FD patch. Add safety check for m4_expand vs. diversions. Add m4_cleardivert. Avoid MacOS readdir bug in testsuite. Improve AC_STATE_SAVE. Fix m4_location inside m4_wrap with m4 1.4.5. Document m4_version_prereq. Mention limitation of M4 1.4.x on builtin tokens. Fix separator in m4_stack_foreach_sep. Document some recently added macros. Fix typo in previous commit. Make m4_dumpdef more useful with M4 1.6. Make it easier to track diversion bugs. Maintainer cleanups. Avoid underfull hbox. Speed up m4_require. Improve AC_REQUIRE documentation. Clean up some bugs caught by preliminary dependency validation. Warn if macro is provided before indirectly required. Fix out-of-order expansion with expand-before-require. Silence a false positive expand-before-require case. Revert change to AC_DIR_HEADER. Fix typos in recent patches. Improve AC_DEFUN_ONCE semantics. Use URLs in --help output, part 1: autoconf executables. Use URLs in --help output, part 2: configure. Use URLs in --help output, part 3: testsuite. Fix years in copyright notices. Fix AC_C_RESTRICT for Sun Studio 12 C++. Silence another false positive expand-before-require. Reduce blank lines in AC_DEFUN_ONCE macros. Use AC_DEFUN_ONCE for uncontroversial one-shot macros. Document lib64 in config.site. Mention that packagers should not pre-set CFLAGS. Use AC_DEFUN_ONCE for some one-shot AC_PROG macros. Mention new AC_DEFUN_ONCE clients. Fix m4_set speed regression introduced 2008-12-18. Mention recently documented macros. Use m4_translit more efficiently in AS_ESCAPE. Use pkgdatadir consistently. Improve wording for AS_ESCAPE. Resync upstream files. Fix 'make pdf'. Recommend AS_HELP_STRING more prominently. Remove historical inaccuracy. Improve confusing section names. Use test consistently in examples. Manual: mention more expr pitfalls. Fix underquoted example in manual. For now, skip parallel tests under less-tested shells. Fix testsuite failures under zsh. Beta Release Version 2.63b. Jim Meyering (3): AC_FUNC_GETGROUPS: always define $ac_cv_func_getgroups_works AC_HEADER_ASSERT: don't say assertions are disabled when they're not Manual: fix a typo. Paolo Bonzini (59): add a separate diversion for shell functions add m4sh keyword to all m4sh.at tests place _AS_UNSET_PREPARE in the right diversion remove shell function "spy" avoid problems when _AS_BASENAME_EXPR are invoked before _AS_EXPR_PREPARE more cleanup before adding shell functions use a shell function for AS_MKDIR_P don't advertise shell function adversely extract "Programming in M4sh" into its own chapter Add and document AS_ME_PREPARE and AS_LINENO_PREPARE place names of contributors under m4 rather than shell comments commit missing changelog entry Add and document AS_INIT_GENERATED. Test AS_ME_PREPARE. Test AS_LINENO_PREPARE. Use m4_require to implement AS_REQUIRE. Support a stack of LINENO values for AS_MESSAGE. Trim down the size of the better-shell test. Use "test x$foo = xyes" to avoid upsetting Libtool's sh.test. Turn AS_SHELL_SANITIZE into a for-Libtool-only wrapper. Assume a (possibly buggy) `unset' is present after a `better shell' was found. Updates to shell portability documentation Fix Libtool's config.lt test. Add a testcase using more then one language. Make sure that nested AS_REQUIRE do not lose the desired diversion. Add AC_REQUIRE_SHELL_FN and the SHELL_FN diversion. Use a shell function for _AC_PREPROC_IFELSE. Use a shell function for _AC_COMPILE_IFELSE. Use a shell function for _AC_LINK_IFELSE. Use a shell function for _AC_RUN_IFELSE. Ensure actions can look at conftest* files. Avoid a fork in _AC_RUN_LOG and _AC_RUN_LOG_STDERR Eliminate empty lines after AC_*_IFELSE. Use a shell function for AC_CHECK_FUNC. Use a shell function for _AC_CHECK_HEADER_MONGREL. use a shell function for the rest of AC_CHECK_HEADER use a shell function for AC_CHECK_DECL use a shell function for AC_CHECK_TYPE use a shell function for AC_COMPUTE_INT use a shell function for AC_CHECK_MEMBER Fix AS_ESCAPE usage together with AC_INCLUDES_DEFAULT. use a shell function for AC_TYPE_INTx_T add m4_stack_foreach and m4_stack_foreach_lifo Rewrite handling of diversion and expansion stack. Add third argument to _AS_PATH_WALK Avoid walking the entire PATH when looking for a better shell. trim down the length of the shell function test Require _AS_CR_PREPARE where appropriate and fix ChangeLog. Pass CONFIG_SHELL down to generated scripts, and re-export SHELL. Do not check for $LINENO in generated scripts. Rename _AC_CHECK_HEADER_OLD and _AC_CHECK_HEADER_NEW. Use preprocessor in cpp tests. Commit ChangeLog entry Reorganize definition of languages Dispatch on AC_LANG_CONFTEST Change `present but cannot be compiled' behavior to use compiler result. Remove three forks per _AC_RUN_LOG_STDERR in the common case. Balance parentheses in _AC_CACHE_DUMP. Fix AC_HEADER_ASSERT not to treat --enable-assert and --disable-assert the same. Peter Breitenlohner (1): Quote traced macros passed from autom4te to M4. Ralf Wildenhues (24): Mention Solaris sh ':' redirection bug. Improve AC_CONFIG_AUX_DIRS a bit. Implement parallel Autotest test execution: testsuite --jobs. Fix hang with `testsuite -k notmatched'. Fix more testsuite hang corner cases. Do not write to testsuite log fd before initialization. Document AS_VERSION_COMPARE. Show how to extract single substitutions from config.status. Fix parallel test execution output lossage. Point at AM_SUBST_NOTMAKE. Fix a couple of typos in the manual. Bump copyright years in local.at. Wrap keywords in `testsuite --list' output. Do not use read-only variable $status. Fix exit status of expr version of as_func_arith. Simplify, avoid unbalanced parentheses from last change. Use a different workaround for an automake quirk. More reliable signal handling in Autotest. Fix a couple of test failures with dash. Hide `set -m' error message, for zsh. Ignore `set -e'-related failure of NetBSD sh. Add index for config.site. Manual: testsuite depends on package.m4. New test for SunStudio `restrict' handling. William Pursell (3): Fix some typos and grammatical errors in documentation. Fix AC_HEADER_ASSERT w.r.t. --enable-assert. Use AS_CASE in documented example. ----------------------------------------------------------------------- hooks/post-receive -- GNU Autoconf source repository From MAILER-DAEMON Tue Mar 31 08:39:46 2009 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LodFo-00059O-Tj for mharc-autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:45 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LodFh-00055R-JA for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LodFe-00053L-EG for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:36 -0400 Received: from [199.232.76.173] (port=59290 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LodFc-000530-TD for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:33 -0400 Received: from savannah.gnu.org ([199.232.41.3]:38161 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LodFc-0004zH-BQ for autoconf-commit@gnu.org; Tue, 31 Mar 2009 08:39:32 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LodFb-00010s-FD for autoconf-commit@gnu.org; Tue, 31 Mar 2009 12:39:31 +0000 Received: from ericb by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LodFa-0000zP-Nr for autoconf-commit@gnu.org; Tue, 31 Mar 2009 12:39:31 +0000 From: "Eric Blake" To: autoconf-commit@gnu.org X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e7399cdcce9ef10d80bd010376c706358adf6fe5 X-Git-Newrev: 85cc7e8e7d1caefc5be949069a62e1bb536d3e64 Message-Id: Date: Tue, 31 Mar 2009 12:39:30 +0000 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [SCM] GNU Autoconf source repository branch, master, updated. v2.63b-1-g85cc7e8 X-BeenThere: autoconf-commit@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: autoconf-patches@gnu.org List-Id: Commits to the Autoconf git repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Mar 2009 12:39:39 -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=85cc7e8e7d1caefc5be949069a62e1bb536d3e64 The branch, master has been updated via 85cc7e8e7d1caefc5be949069a62e1bb536d3e64 (commit) via ddbb239f1221935fb90768b2e21986713518adf2 (commit) from e7399cdcce9ef10d80bd010376c706358adf6fe5 (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 85cc7e8e7d1caefc5be949069a62e1bb536d3e64 Author: Eric Blake Date: Tue Mar 31 06:23:42 2009 -0600 ./.prev-version: Record previous version: 2.63b. commit ddbb239f1221935fb90768b2e21986713518adf2 Author: Eric Blake Date: Mon Mar 30 08:45:11 2009 -0600 Beta Release Version 2.63b. * NEWS: Mention the release. * README: Clarify that this is a beta release. * build-aux/texinfo.tex: Synchronize from upstream. * .x-sc_trailing_blank: Exempt more upstream files. Signed-off-by: Eric Blake ----------------------------------------------------------------------- Summary of changes: .prev-version | 2 +- .x-sc_trailing_blank | 3 + ChangeLog | 8 ++ NEWS | 7 +- README | 8 +- build-aux/texinfo.tex | 221 ++++++++++++++++++++++++++++-------------------- 6 files changed, 150 insertions(+), 99 deletions(-) diff --git a/.prev-version b/.prev-version index c95fea5..c9f2f5b 100644 --- a/.prev-version +++ b/.prev-version @@ -1 +1 @@ -2.63 +2.63b diff --git a/.x-sc_trailing_blank b/.x-sc_trailing_blank index d97c0b6..0227407 100644 --- a/.x-sc_trailing_blank +++ b/.x-sc_trailing_blank @@ -1,2 +1,5 @@ +build-aux/gendocs.sh build-aux/texinfo.tex +doc/gendocs_template +doc/gnu-oids.texi doc/standards.texi diff --git a/ChangeLog b/ChangeLog index ac19a64..f0f9296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-31 Eric Blake + + Beta Release Version 2.63b. + * NEWS: Mention the release. + * README: Clarify that this is a beta release. + * build-aux/texinfo.tex: Synchronize from upstream. + * .x-sc_trailing_blank: Exempt more upstream files. + 2009-03-30 Eric Blake Fix testsuite failures under zsh. diff --git a/NEWS b/NEWS index 34b4380..23110ac 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ GNU Autoconf NEWS - User visible changes. -* Major changes in Autoconf 2.64 (????-??-??) [stable] +* Major changes in Autoconf 2.63b (2009-03-31) [beta] Released by Eric Blake, based on git versions 2.63.*. ** The manual is now shipped under the terms of the GNU FDL 1.3. @@ -40,11 +40,14 @@ GNU Autoconf NEWS - User visible changes. used in `configure --help' and is also available via AC_DEFINE. ** Autotest testsuites accept an option --jobs[=N] for parallel testing. + This feature is still in testing, and may not work on every + platform, help in improving it would be appreciated. ** Autotest testsuites do not attempt to write startup error messages to the log file before that is opened (regression introduced in 2.63). -** Configure scripts now use shell functions. +** Configure scripts now use shell functions. This feature leads to + smaller configure files and faster execution. ** Present But Cannot Be Compiled: Autoconf will now proceed with the compiler's result if a header is present but cannot be compiled. diff --git a/README b/README index 9641812..593ee86 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ macro calls. Producing configuration scripts using Autoconf requires GNU M4 and Perl. You should install GNU M4 (version 1.4.5 or later is required; -1.4.11 or later is recommended) and Perl (5.005_03 or later) before +1.4.12 or later is recommended) and Perl (5.005_03 or later) before configuring Autoconf, so that Autoconf's configure script can find them. The configuration scripts produced by Autoconf are self-contained, so their users do not need to have Autoconf (or GNU @@ -29,8 +29,8 @@ of the package, where to report bugs, and a pointer to INSTALL for instructions on compilation and installation. This removes the need to maintain many similar sets of installation instructions. -Be sure to read BUGS (especially if this version is not an official -release) and INSTALL. +Be sure to read BUGS (in particular since this is a beta release) and +INSTALL. Mail suggestions to autoconf@gnu.org, report bugs to bug-autoconf@gnu.org, and submit patches to autoconf-patches@gnu.org. @@ -62,7 +62,7 @@ For more licensing information, see ----- Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009 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 diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 03c2998..7f876b4 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2009-01-18.17} +\def\texinfoversion{2009-03-22.17} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -358,7 +358,7 @@ % We don't want .vr (or whatever) entries like this: % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} % "\acronym" won't work when it's read back in; - % it needs to be + % it needs to be % {\code {{\tt \backslashcurfont }acronym} \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. @@ -709,7 +709,7 @@ \def\?{?\spacefactor=\endofsentencespacefactor\space} % @frenchspacing on|off says whether to put extra space after punctuation. -% +% \def\onword{on} \def\offword{off} % @@ -1285,7 +1285,7 @@ where each line of input produces a line of output.} % that's what we do). % double active backslashes. -% +% {\catcode`\@=0 \catcode`\\=\active @gdef@activebackslashdouble{% @catcode`@\=@active @@ -1297,11 +1297,11 @@ where each line of input produces a line of output.} % us) handles it with this amazing macro to replace tokens, with minor % changes for Texinfo. It is included here under the GPL by permission % from the author, Heiko Oberdiek. -% +% % #1 is the tokens to replace. % #2 is the replacement. % #3 is the control sequence with the string. -% +% \def\HyPsdSubst#1#2#3{% \def\HyPsdReplace##1#1##2\END{% ##1% @@ -1573,7 +1573,7 @@ output) for that.)} % tried to figure out what each command should do in the context % of @url. for now, just make @/ a no-op, that's the only one % people have actually reported a problem with. - % + % \normalturnoffactive \def\@{@}% \let\/=\empty @@ -1981,7 +1981,7 @@ end % Definitions for a main text size of 11pt. This is the default in % Texinfo. -% +% \def\definetextfontsizexi{% % Text fonts (11.2pt, magstep1). \def\textnominalsize{11pt} @@ -2112,7 +2112,7 @@ end % section, chapter, etc., sizes following suit. This is for the GNU % Press printing of the Emacs 22 manual. Maybe other manuals in the % future. Used with @smallbook, which sets the leading to 12pt. -% +% \def\definetextfontsizex{% % Text fonts (10pt). \def\textnominalsize{10pt} @@ -2201,7 +2201,7 @@ end \setfont\secsf\sfbshape{12}{1000}{OT1} \let\secbf\secrm \setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 +\font\seci=cmmi12 \font\secsy=cmsy10 scaled \magstep1 \def\sececsize{1200} @@ -2245,7 +2245,7 @@ end % We provide the user-level command % @fonttextsize 10 % (or 11) to redefine the text font size. pt is assumed. -% +% \def\xword{10} \def\xiword{11} % @@ -2255,7 +2255,7 @@ end % % Set \globaldefs so that documents can use this inside @tex, since % makeinfo 4.8 does not support it, but we need it nonetheless. - % + % \begingroup \globaldefs=1 \ifx\textsizearg\xword \definetextfontsizex \else \ifx\textsizearg\xiword \definetextfontsizexi @@ -2472,8 +2472,8 @@ end % from cmtt (char 0x0d). The undirected quote is ugly, so don't make it % the default, but it works for pasting with more pdf viewers (at least % evince), the lilypond developers report. xpdf does work with the -% regular 0x27. -% +% regular 0x27. +% \def\codequoteright{% \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax @@ -2485,7 +2485,7 @@ end % and a similar option for the left quote char vs. a grave accent. % Modern fonts display ASCII 0x60 as a grave accent, so some people like % the code environments to do likewise. -% +% \def\codequoteleft{% \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax @@ -2669,7 +2669,7 @@ end % each of the four underscores in __typeof__. This is undesirable in % some manuals, especially if they don't have long identifiers in % general. @allowcodebreaks provides a way to control this. -% +% \newif\ifallowcodebreaks \allowcodebreakstrue \def\keywordtrue{true} @@ -2794,7 +2794,7 @@ end % @acronym for "FBI", "NATO", and the like. % We print this one point size smaller, since it's intended for % all-uppercase. -% +% \def\acronym#1{\doacronym #1,,\finish} \def\doacronym#1,#2,#3\finish{% {\selectfonts\lsize #1}% @@ -2806,7 +2806,7 @@ end % @abbr for "Comput. J." and the like. % No font change, but don't do end-of-sentence spacing. -% +% \def\abbr#1{\doabbr #1,,\finish} \def\doabbr#1,#2,#3\finish{% {\plainfrenchspacing #1}% @@ -2863,52 +2863,59 @@ end % Theiling, which support regular, slanted, bold and bold slanted (and % "outlined" (blackboard board, sort of) versions, which we don't need). % It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% +% % Although only regular is the truly official Euro symbol, we ignore % that. The Euro is designed to be slightly taller than the regular % font height. -% +% % feymr - regular % feymo - slanted % feybr - bold % feybo - bold slanted -% +% % There is no good (free) typewriter version, to my knowledge. % A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. % Hmm. -% +% % Also doesn't work in math. Do we need to do math with euro symbols? % Hope not. -% -% +% +% \def\euro{{\eurofont e}} \def\eurofont{% % We set the font at each command, rather than predefining it in % \textfonts and the other font-switching commands, so that % installations which never need the symbol don't have to have the % font installed. - % + % % There is only one designed size (nominal 10pt), so we always scale % that to the current nominal size. - % + % % By the way, simply using "at 1em" works for cmr10 and the like, but % does not work for cmbx10 and other extended/shrunken fonts. - % + % \def\eurosize{\csname\curfontsize nominalsize\endcsname}% % - \ifx\curfontstyle\bfstylename + \ifx\curfontstyle\bfstylename % bold: \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else + \else % regular: \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize \fi \thiseurofont } -% Hacks for glyphs from the EC fonts similar to \euro. We don't -% use \let for the aliases, because sometimes we redefine the original -% macro, and the alias should reflect the redefinition. +% Glyphs from the EC fonts. We don't use \let for the aliases, because +% sometimes we redefine the original macro, and the alias should reflect +% the redefinition. +% +% Use LaTeX names for the Icelandic letters. +\def\DH{{\ecfont \char"D0}} % Eth +\def\dh{{\ecfont \char"F0}} % eth +\def\TH{{\ecfont \char"DE}} % Thorn +\def\th{{\ecfont \char"FE}} % thorn +% \def\guillemetleft{{\ecfont \char"13}} \def\guillemotleft{\guillemetleft} \def\guillemetright{{\ecfont \char"14}} @@ -2922,7 +2929,7 @@ end % we have the precomposed glyphs for the most common cases. We put the % tests to use those glyphs in the single \ogonek macro so we have fewer % dummy definitions to worry about for index entries, etc. -% +% % ogonek is also used with other letters in Lithuanian (IOU), but using % the precomposed glyphs for those is not so easy since they aren't in % the same EC font. @@ -2945,6 +2952,7 @@ end \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} % +% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. \def\ecfont{% % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German @@ -2979,7 +2987,7 @@ end % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. -% +% \ifx\Orb\undefined \def\Orb{\mathhexbox20D} \fi @@ -3325,7 +3333,7 @@ end % cause the example and the item to crash together. So we use this % bizarre value of 10001 as a signal to \aboveenvbreak to insert % \parskip glue after all. Section titles are handled this way also. - % + % \penalty 10001 \endgroup \itemxneedsnegativevskipfalse @@ -4138,7 +4146,7 @@ end % processing continues to some further point. On the other hand, it % seems \endinput does not hurt in the printed index arg, since that % is still getting written without apparent harm. - % + % % Sample source (mac-idx3.tex, reported by Graham Percival to % help-texinfo, 22may06): % @macro funindex {WORD} @@ -4146,12 +4154,12 @@ end % @end macro % ... % @funindex commtest - % + % % The above is not enough to reproduce the bug, but it gives the flavor. - % + % % Sample whatsit resulting: % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} - % + % % So: \let\endinput = \empty % @@ -4203,19 +4211,23 @@ end % Non-English letters. \definedummyword\AA \definedummyword\AE + \definedummyword\DH \definedummyword\L - \definedummyword\OE \definedummyword\O + \definedummyword\OE + \definedummyword\TH \definedummyword\aa \definedummyword\ae + \definedummyword\dh + \definedummyword\exclamdown \definedummyword\l - \definedummyword\oe \definedummyword\o - \definedummyword\ss - \definedummyword\exclamdown - \definedummyword\questiondown + \definedummyword\oe \definedummyword\ordf \definedummyword\ordm + \definedummyword\questiondown + \definedummyword\ss + \definedummyword\th % % Although these internal commands shouldn't show up, sometimes they do. \definedummyword\bf @@ -4358,19 +4370,23 @@ end % Non-English letters. \def\AA{AA}% \def\AE{AE}% + \def\DH{DZZ}% \def\L{L}% \def\OE{OE}% \def\O{O}% + \def\TH{ZZZ}% \def\aa{aa}% \def\ae{ae}% + \def\dh{dzz}% + \def\exclamdown{!}% \def\l{l}% \def\oe{oe}% - \def\o{o}% - \def\ss{ss}% - \def\exclamdown{!}% - \def\questiondown{?}% \def\ordf{a}% \def\ordm{o}% + \def\o{o}% + \def\questiondown{?}% + \def\ss{ss}% + \def\th{zzz}% % \def\LaTeX{LaTeX}% \def\TeX{TeX}% @@ -4409,11 +4425,11 @@ end % makeinfo does not expand macros in the argument to @deffn, which ends up % writing an index entry, and texindex isn't prepared for an index sort entry % that starts with \. - % + % % Since macro invocations are followed by braces, we can just redefine them % to take a single TeX argument. The case of a macro invocation that % goes to end-of-line is not handled. - % + % \macrolist } @@ -4541,7 +4557,7 @@ end % to re-insert the same penalty (values >10000 are used for various % signals); since we just inserted a non-discardable item, any % following glue (such as a \parskip) would be a breakpoint. For example: - % + % % @deffn deffn-whatever % @vindex index-whatever % Description. @@ -5122,7 +5138,9 @@ end \gdef\chaplevelprefix{\the\chapno.}% \resetallfloatnos % - \message{\putwordChapter\space \the\chapno}% + % \putwordChapter can contain complex things in translations. + \toks0=\expandafter{\putwordChapter}% + \message{\the\toks0 \space \the\chapno}% % % Write the actual heading. \chapmacro{#1}{Ynumbered}{\the\chapno}% @@ -5133,15 +5151,17 @@ end \global\let\subsubsection = \numberedsubsubsec } -\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz +\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz +% \def\appendixzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 \global\advance\appendixno by 1 \gdef\chaplevelprefix{\appendixletter.}% \resetallfloatnos % - \def\appendixnum{\putwordAppendix\space \appendixletter}% - \message{\appendixnum}% + % \putwordAppendix can contain complex things in translations. + \toks0=\expandafter{\putwordAppendix}% + \message{\the\toks0 \space \appendixletter}% % \chapmacro{#1}{Yappendix}{\appendixletter}% % @@ -5374,7 +5394,10 @@ end \xdef\lastchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\appendixletter}% - \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum: + % \noexpand\putwordAppendix avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} + \noexpand\thischapternum: \noexpand\thischaptername}% }% \else @@ -5382,7 +5405,10 @@ end \xdef\lastchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\the\chapno}% - \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum: + % \noexpand\putwordChapter avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordChapter{} + \noexpand\thischapternum: \noexpand\thischaptername}% }% \fi\fi\fi @@ -5525,7 +5551,10 @@ end \xdef\lastsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: \noexpand\thissectionname}% }% \fi @@ -5535,7 +5564,10 @@ end \xdef\lastsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - \gdef\noexpand\thissection{\putwordSection{} \noexpand\thissectionnum: + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: \noexpand\thissectionname}% }% \fi @@ -5611,11 +5643,11 @@ end % glue accumulate. (Not a breakpoint because it's preceded by a % discardable item.) \vskip-\parskip - % + % % This is purely so the last item on the list is a known \penalty > % 10000. This is so \startdefun can avoid allowing breakpoints after % section headings. Otherwise, it would insert a valid breakpoint between: - % + % % @section sec-whatever % @deffn def-whatever \penalty 10001 @@ -5673,7 +5705,7 @@ end % These characters do not print properly in the Computer Modern roman % fonts, so we must take special care. This is more or less redundant % with the Texinfo input format setup at the end of this file. -% +% \def\activecatcodes{% \catcode`\"=\active \catcode`\$=\active @@ -5723,7 +5755,7 @@ end % redefined for the two-volume lispref. We always output on % \jobname.toc even if this is redefined. -% +% \def\tocreadfilename{\jobname.toc} % Normal (long) toc. @@ -6815,7 +6847,7 @@ end % This does \let #1 = #2, with \csnames; that is, % \let \csname#1\endcsname = \csname#2\endcsname % (except of course we have to play expansion games). -% +% \def\cslet#1#2{% \expandafter\let \csname#1\expandafter\endcsname @@ -7975,21 +8007,22 @@ end \closein 1 \endgroup % end raw TeX \endgroup} -} % % If they passed de_DE, and txi-de_DE.tex doesn't exist, % try txi-de.tex. -% -\def\documentlanguagetrywithoutunderscore#1_#2\finish{% +% +\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% \openin 1 txi-#1.tex \ifeof 1 \errhelp = \nolanghelp \errmessage{Cannot read language file txi-#1.tex}% \else + \globaldefs = 1 % everything in the txi-LL files needs to persist \input txi-#1.tex \fi \closein 1 } +}% end of special _ catcode % \newhelp\nolanghelp{The given language definition file cannot be found or is empty. Maybe you need to install it? Putting it in the current @@ -7998,16 +8031,16 @@ directory should work if nowhere else does.} % This macro is called from txi-??.tex files; the first argument is the % \language name to set (without the "\lang@" prefix), the second and % third args are \{left,right}hyphenmin. -% +% % The language names to pass are determined when the format is built. % See the etex.log file created at that time, e.g., % /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. -% +% % With TeX Live 2008, etex now includes hyphenation patterns for all % available languages. This means we can support hyphenation in % Texinfo, at least to some extent. (This still doesn't solve the % accented characters problem.) -% +% \catcode`@=11 \def\txisetlanguage#1#2#3{% % do not set the language if the name is undefined in the current TeX. @@ -8062,7 +8095,7 @@ directory should work if nowhere else does.} \setnonasciicharscatcode\active \lattwochardefs % - \else \ifx \declaredencoding \latone + \else \ifx \declaredencoding \latone \setnonasciicharscatcode\active \latonechardefs % @@ -8074,7 +8107,7 @@ directory should work if nowhere else does.} \setnonasciicharscatcode\active \utfeightchardefs % - \else + \else \message{Unknown document encoding #1, ignoring.}% % \fi % utfeight @@ -8086,7 +8119,7 @@ directory should work if nowhere else does.} % A message to be logged when using a character that isn't available % the default font encoding (OT1). -% +% \def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} % Take account of \c (plain) vs. \, (Texinfo) difference. @@ -8099,21 +8132,21 @@ directory should work if nowhere else does.} % % Latin1 (ISO-8859-1) character definitions. \def\latonechardefs{% - \gdef^^a0{~} + \gdef^^a0{~} \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} + \gdef^^a2{\missingcharmsg{CENT SIGN}} \gdef^^a3{{\pounds}} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a6{\missingcharmsg{BROKEN BAR}} \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} + \gdef^^a8{\"{}} + \gdef^^a9{\copyright} \gdef^^aa{\ordf} \gdef^^ab{\guillemetleft} \gdef^^ac{$\lnot$} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} + \gdef^^ad{\-} + \gdef^^ae{\registeredsymbol} \gdef^^af{\={}} % \gdef^^b0{\textdegree} @@ -8140,7 +8173,7 @@ directory should work if nowhere else does.} \gdef^^c2{\^A} \gdef^^c3{\~A} \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} + \gdef^^c5{\ringaccent A} \gdef^^c6{\AE} \gdef^^c7{\cedilla C} \gdef^^c8{\`E} @@ -8152,7 +8185,7 @@ directory should work if nowhere else does.} \gdef^^ce{\^I} \gdef^^cf{\"I} % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} + \gdef^^d0{\DH} \gdef^^d1{\~N} \gdef^^d2{\`O} \gdef^^d3{\'O} @@ -8166,7 +8199,7 @@ directory should work if nowhere else does.} \gdef^^db{\^U} \gdef^^dc{\"U} \gdef^^dd{\'Y} - \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} + \gdef^^de{\TH} \gdef^^df{\ss} % \gdef^^e0{\`a} @@ -8186,7 +8219,7 @@ directory should work if nowhere else does.} \gdef^^ee{\^{\dotless i}} \gdef^^ef{\"{\dotless i}} % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} + \gdef^^f0{\dh} \gdef^^f1{\~n} \gdef^^f2{\`o} \gdef^^f3{\'o} @@ -8200,7 +8233,7 @@ directory should work if nowhere else does.} \gdef^^fb{\^u} \gdef^^fc{\"u} \gdef^^fd{\'y} - \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} + \gdef^^fe{\th} \gdef^^ff{\"y} } @@ -8272,7 +8305,7 @@ directory should work if nowhere else does.} \gdef^^ce{\^I} \gdef^^cf{\v D} % - \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} + \gdef^^d0{\DH} \gdef^^d1{\'N} \gdef^^d2{\v N} \gdef^^d3{\'O} @@ -8281,7 +8314,7 @@ directory should work if nowhere else does.} \gdef^^d6{\"O} \gdef^^d7{$\times$} \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} + \gdef^^d9{\ringaccent U} \gdef^^da{\'U} \gdef^^db{\H U} \gdef^^dc{\"U} @@ -8306,7 +8339,7 @@ directory should work if nowhere else does.} \gdef^^ee{\^\i} \gdef^^ef{\v d} % - \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} + \gdef^^f0{\dh} \gdef^^f1{\'n} \gdef^^f2{\v n} \gdef^^f3{\'o} @@ -8325,11 +8358,11 @@ directory should work if nowhere else does.} } % UTF-8 character definitions. -% +% % This code to support UTF-8 is based on LaTeX's utf8.def, with some % changes for Texinfo conventions. It is included here under the GPL by % permission from Frank Mittelbach and the LaTeX team. -% +% \newcount\countUTFx \newcount\countUTFy \newcount\countUTFz @@ -8479,6 +8512,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00CE}{\^I} \DeclareUnicodeCharacter{00CF}{\"I} + \DeclareUnicodeCharacter{00D0}{\DH} \DeclareUnicodeCharacter{00D1}{\~N} \DeclareUnicodeCharacter{00D2}{\`O} \DeclareUnicodeCharacter{00D3}{\'O} @@ -8491,6 +8525,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00DB}{\^U} \DeclareUnicodeCharacter{00DC}{\"U} \DeclareUnicodeCharacter{00DD}{\'Y} + \DeclareUnicodeCharacter{00DE}{\TH} \DeclareUnicodeCharacter{00DF}{\ss} \DeclareUnicodeCharacter{00E0}{\`a} @@ -8510,6 +8545,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} + \DeclareUnicodeCharacter{00F0}{\dh} \DeclareUnicodeCharacter{00F1}{\~n} \DeclareUnicodeCharacter{00F2}{\`o} \DeclareUnicodeCharacter{00F3}{\'o} @@ -8522,6 +8558,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00FB}{\^u} \DeclareUnicodeCharacter{00FC}{\"u} \DeclareUnicodeCharacter{00FD}{\'y} + \DeclareUnicodeCharacter{00FE}{\th} \DeclareUnicodeCharacter{00FF}{\"y} \DeclareUnicodeCharacter{0100}{\=A} @@ -9178,7 +9215,7 @@ directory should work if nowhere else does.} % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of % the literal character `\'. -% +% @def@normalturnoffactive{% @let\=@normalbackslash @let"=@normaldoublequote @@ -9234,7 +9271,7 @@ directory should work if nowhere else does.} @catcode`@`=@active @markupsetuplqdefault @markupsetuprqdefault - + @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" hooks/post-receive -- GNU Autoconf source repository