[FYI] NG-NEWS: prefer "no longer" over "not anymore"; plus few minor fixlets
Signed-off-by: Stefano Lattarini --- NG-NEWS | 45 ++--- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/NG-NEWS b/NG-NEWS index 69d22e4..b4fbc55 100644 --- a/NG-NEWS +++ b/NG-NEWS @@ -103,7 +103,7 @@ Compilation and Object Files Serial testsuite harness (obsolescent) == -* The $(TESTS) and $(XFAIL_TESTS) variables are not anymore rewritten for +* The $(TESTS) and $(XFAIL_TESTS) variables are no longer rewritten for $(EXEEXT) appending. The use of compiled programs in $(TESTS) and $(XFAIL_TESTS) still works as before though, even on systems where $(EXEEXT) is non-empty. @@ -112,11 +112,10 @@ Serial testsuite harness (obsolescent) Parallel testsuite harness == -* Automake does not automatically generate the definition of 'LOG_COMPILE' - variables anymore. These have always been meant for internal use only - anyway. +* Automake no longer automatically generate the definition of 'LOG_COMPILE' + variables. These have always been meant for internal use only anyway. -* The $(TESTS) and $(XFAIL_TESTS) variables are not anymore rewritten for +* The $(TESTS) and $(XFAIL_TESTS) variables are no longer rewritten for $(EXEEXT) appending. The use of compiled programs in $(TESTS) still works as before though, even on systems where $(EXEEXT) is non-empty, thanks to a careful use of pattern rules. @@ -168,7 +167,7 @@ Parallel testsuite harness * Errors about invalid content of $(TEST_EXTENSIONS) are reported at make runtime, not auto Automake runtime. -* It is not anymore possible to override TEST_LOGS at make runtime as a +* It is no longer possible to override TEST_LOGS at make runtime as a mean to redefine the list of tests to be run. # This won't work anymore! @@ -182,7 +181,7 @@ Parallel testsuite harness # "foo.test", "bar.test$(EXEEXT)" and "baz$(EXEEXT)". make check TESTS="foo bar baz" -* The use of 'RECHECK_LOGS' is not supported anymore. Thus, to lazily +* The use of 'RECHECK_LOGS' is no longer supported. Thus, to lazily re-run only the tests whose '.trs' or '.log' files are out-of-date, one must now use: @@ -200,7 +199,7 @@ Parallel testsuite harness Distribution -* "Bare" wildcards are not usable anymore in $(EXTRA_DIST): +* "Bare" wildcards are no longer usable in $(EXTRA_DIST): EXTRA_DIST = $(srcdir)/doc/*.txt # This won't work anymore. @@ -265,11 +264,11 @@ Distribution Obsolete Features Removed = -* Extension-less info files are not supported anymore. +* Extension-less info files are no longer supported. -* The only accepted suffix for input Texinfo files is now '.texi'; - the once-accepted values '.txi' and '.texinfo' are not handled - anymore, and their use will trigger an error. +* The only accepted suffix for input Texinfo files is now '.texi'; the + once-accepted values '.txi' and '.texinfo' are no longer handled, and + their use will trigger an error. * If the sources for a target library like 'libfoo.a' or 'libbar.la' are not explicitly specified, mainline Automake looks also (respectively) @@ -285,9 +284,9 @@ Obsolete Features Removed as recommended in the Autoconf manual (as of Autoconf 2.69, chapter "Obsolete Constructs", section "acconfig.h"). -* The 'mkinstalldirs' script is not installed, distributed, nor provided - anymore; its same effects can be obtained by "install-sh -d" instead. - Similarly, the $(mkinstallscripts) make variable is not defined anymore; +* The 'mkinstalldirs' script is no longer installed, distributed, nor + provided; its same effects can be obtained by "install-sh -d" instead. + Similarly, the $(mkinstallscripts) make variable is no longer defined; one should use $(MKDIR_P) instead. * The Automake-defined internal make variable '$(ACLOCAL_M4)' has been @@ -365,9 +364,9 @@ Source Files with Unknown Extensions (compilation rules, requirement for AC_PROG_CXX in configure.ac, etc), and use the C++ linker to link the 'foo' executable. - But Autommake-NG *won't follow those implicit chains of pattern rules* - anymore; so that the idiom above will have to be re-worked like follows - to preserve its intent and behaviour: + But Automake-NG will *no longer follow those implicit chains* of + pattern rules; so that the idiom above will have to be re-worked + like follows to preserve its intent and behaviour: %.cc: %.zoo: $(preprocess) $< > $@ @@ -378,9 +377,9 @@ Source Files with Unknown Extensions nodist_foo_SOURCES = bar.cc EXTRA_DIST = foo.zoo - And there is another major consequence of this change of semantics: one - can't use anymore "header files" with extensions unrecognized to Automake - anymore; for example, an usage like this will cause errors at make + And there is another major consequence of this change of semantics: now + one can no lo
[FYI] {maint} tests: better names for temporary configure.ac files
When editing a pre-existent 'configure.ac' file in a test script, name
the temporary file 'configure.tmp' rather than 'configure.int'; the
latter was a relict of the times when we used 'configure.in' as the
default name for the Autoconf input files throughout the testsuite.
* t/cond43.sh: Adjust.
* t/depcomp8a.sh: Likewise.
* t/depcomp8b.sh: Likewise.
* t/gettext.sh: Likewise.
* t/mmode.sh: Likewise.
* t/pr401.sh: Likewise.
* t/pr401b.sh: Likewise.
* t/pr401c.sh: Likewise.
* t/python11.sh: Likewise.
* t/cond42.sh: Likewise. Also, while at it, rename ...
(edit_configure_in): ... this function ...
(edit_configure_ac): ... like this.
Signed-off-by: Stefano Lattarini
---
t/cond42.sh| 13 +++--
t/cond43.sh| 4 ++--
t/depcomp8a.sh | 4 ++--
t/depcomp8b.sh | 4 ++--
t/gettext.sh | 4 ++--
t/mmode.sh | 12 ++--
t/pr401.sh | 12 ++--
t/pr401b.sh| 12 ++--
t/pr401c.sh| 12 ++--
t/python11.sh | 4 ++--
10 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/t/cond42.sh b/t/cond42.sh
index b3d0305..f90341d 100755
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+nfig
# Copyright (C) 2008-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -28,10 +29,10 @@ _AM_COND_IF([COND])
AC_OUTPUT
END
-edit_configure_in ()
+edit_configure_ac ()
{
- sed "$@" < configure.ac >configure.int
- mv -f configure.int configure.ac
+ sed "$@" < configure.ac >configure.tmp
+ mv -f configure.tmp configure.ac
rm -rf autom4te*.cache
}
@@ -41,15 +42,15 @@ $ACLOCAL
AUTOMAKE_fails
grep '^configure\.ac:8:.* condition stack' stderr
-edit_configure_in 's/_AM_COND_IF/_AM_COND_ELSE/'
+edit_configure_ac 's/_AM_COND_IF/_AM_COND_ELSE/'
AUTOMAKE_fails
grep '^configure\.ac:7:.* else without if' stderr
-edit_configure_in 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
+edit_configure_ac 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
AUTOMAKE_fails
grep '^configure\.ac:7:.* endif without if' stderr
-edit_configure_in 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
+edit_configure_ac 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
_AM_COND_ENDIF/'
AUTOMAKE_fails
grep '^configure\.ac:7:.* not enough arguments.* _AM_COND_IF' stderr
diff --git a/t/cond43.sh b/t/cond43.sh
index ff33675..c5da21c 100755
--- a/t/cond43.sh
+++ b/t/cond43.sh
@@ -36,8 +36,8 @@ $EGREP '^configure\.ac:7:.* missing m4 quoting.*macro depth
2( |$)' stderr
sed '/.AM_COND_IF/{
s/^/[/
s/$/]/
- }' < configure.ac > configure.int
-mv -f configure.int configure.ac
+ }' < configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
rm -rf autom4te*.cache
$AUTOMAKE
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 3d58a3e..bc0c276 100755
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -64,8 +64,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking'
$MAKE distcheck
# Try again with subdir-objects option.
-sed 's/#x //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#x //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
$ACLOCAL
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index 6fed215..54834d6 100755
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -56,8 +56,8 @@ DISTCHECK_CONFIGURE_FLAGS='--enable-dependency-tracking'
$MAKE distcheck
# Try again with subdir-objects option.
-sed 's/#x //' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/#x //' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
echo AUTOMAKE_OPTIONS = subdir-objects >> Makefile.am
$ACLOCAL
diff --git a/t/gettext.sh b/t/gettext.sh
index 7cf62ef..88c6138 100755
--- a/t/gettext.sh
+++ b/t/gettext.sh
@@ -46,8 +46,8 @@ if $ACLOCAL; then
fi
: >config.rpath
-sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed '/AM_GNU_GETTEXT_VERSION/d' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
$ACLOCAL
diff --git a/t/mmode.sh b/t/mmode.sh
index ea26c02..9475130 100755
--- a/t/mmode.sh
+++ b/t/mmode.sh
@@ -38,14 +38,14 @@ grep '^MAINT.*#' Makefile
./configure --enable-maintainer-mode
grep '^MAINT.*#' Makefile && exit 1
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.ac > configure.int
-mv -f configure.int configure.ac
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
mv configure configure1
$AUTOCONF --force
diff configure configure1
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.ac > configure.int
-mv -f configure.int configure.ac
+sed 's/\(AM_MAINTAINER_MODE\).*/\1([enable])/' configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
$AUTOCONF --force
./configure
@@ -57,8 +57,8 @@ grep '^MAINT.*#' Makefile && exit 1
./configure --disable-maintainer-mode
grep '^MAINT.*#' Makefile
-sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.ac > configure.int
-mv -f con
[FYI] {maint} sync: update files from upstream with "make fetch"
* lib/config.sub: Update.
* lib/config.guess: Likewise.
Signed-off-by: Stefano Lattarini
---
lib/config.guess | 26 --
lib/config.sub | 33 +++--
2 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/lib/config.guess b/lib/config.guess
index 872b96a..1804e9f 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -2,13 +2,13 @@
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-09-25'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +22,17 @@ timestamp='2012-09-25'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
#
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -55,8 +53,8 @@ GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/lib/config.sub b/lib/config.sub
index 8df5511..802a224 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -2,23 +2,19 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2012-12-06'
+timestamp='2012-12-29'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see
