diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-05 21:54:00 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-05 21:57:05 +0100 |
| commit | 0504f991102aebb57fb31e4d7c85a1f2d7ea8006 (patch) | |
| tree | bb717ca1b71132a8f36526ec4be563f8e54144ea /m4/amversion.m4 | |
| parent | b8aa9fc0ce8d411be4451022e4b14d0f4238a9d9 (diff) | |
| parent | db43dd473361d90d8b00362cfef5bac8e722000d (diff) | |
| download | automake-0504f991102aebb57fb31e4d7c85a1f2d7ea8006.tar.gz | |
Merge branch 'minor' into micro after 1.15 release
And bump version number: 1.15 -> 1.15.0a
* minor:
release: stable minor release 1.15
NEWS: minor improvements and fixed some typos and grammaros
docs: "make distcheck" implementation details are not to be abused
NEWS: improve and adjust in light of the oncoming 1.15 release
Fix dumb logic error preventing $install_sh from being be overridden
Expose automake bug#19311
build: fix race in parallel builds
init: ensure $ac_aux_dir is defined before being used
plans: enabling subdir-object by default is blocked on bug#13928
maint: update copyright years
maint: sync files from upstream ("make fetch")
Typofixes in warning messages and manual
NEWS: a typofix, and better word wrapping
parallel-tests: avoid possible implicit "make all" in test-suite.log rule
Allow user to extend .PRECIOUS target
cosmetics: remove a couple of extra trailing white spaces
tests: fix a spurious failure on Mac OS X
docs: make clear the JAVA primary is frozen
install-sh: a slightly better diagnostic, and tests enhancements
install-sh: be stricter in catching invalid usages
tests: more significant names for some tests
tests: some cosmetic fixes
tests: more significant names for a test
docs: drop a few obsolescent FIXME/TODO comments, and associated text
testsuite harness: report test exit status in log file
TAP driver: no need to invoke AC_PROG_AWK directly
TAP driver: remove perl implementation (move it into contrib/)
NEWS: stop reporting "new" Automake versioning scheme
cosmetics: untabify the install-sh script
install-sh: assume that "set -f" and "set +f" work...
install-sh: assume ${var:-value} works as expected
install-sh: assume 'dirname' is available and working correctly
post-release: micro version bump (1.14a)
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'm4/amversion.m4')
| -rw-r--r-- | m4/amversion.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 645b18df7..a36cc9322 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## Generated from amversion.in; do not edit by hand. -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,10 +12,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1a], [], +m4_if([$1], [1.15.0a], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1a])dnl +[AM_AUTOMAKE_VERSION([1.15.0a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |