diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-22 14:27:47 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-22 14:40:29 +0100 |
| commit | 5431402f057db86fa7350c3c09d6078c12c0447c (patch) | |
| tree | 918772db20a3e691d23139f73fbaf944b9c418bd | |
| parent | ea67a2ea498e07aa8b2db796aa96c7f7594b98f0 (diff) | |
| download | automake-5431402f057db86fa7350c3c09d6078c12c0447c.tar.gz | |
maint: snapshots from `maint' are still development snapshots
The maintenance-oriented development line in the `maint' branch,
while being usually pretty stable and 99% backward-compatible,
is not always right off production-quality; but until now, the
Automake package version declared in configure.ac hid this fact,
since it appeared to be the version of a stable release (e.g.,
11.1). Fix this.
* configure.ac (AC_INIT): Bump version to "1.11.0a"
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/amversion.m4 | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -1,5 +1,16 @@ 2011-12-22 Stefano Lattarini <stefano.lattarini@gmail.com> + maint: snapshots from `maint' are still development snapshots + The maintenance-oriented development line in the `maint' branch, + while being usually pretty stable and 99% backward-compatible, + is not always right off production-quality; but until now, the + Automake package version declared in configure.ac hid this fact, + since it appeared to be the version of a stable release (e.g., + 11.1). Fix this. + * configure.ac (AC_INIT): Bump version to "1.11.0a". + +2011-12-22 Stefano Lattarini <stefano.lattarini@gmail.com> + configure: print proper message for test releases * configure.ac: If the current release is detected to be a test release or a development snapshot, print a proper warning for diff --git a/configure.ac b/configure.ac index e73c16b9a..8b1d6851f 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ([2.68]) -AC_INIT([GNU Automake], [1.11], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.11.0a], [bug-automake@gnu.org]) m4_ifndef([AC_PACKAGE_URL], [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])]) diff --git a/m4/amversion.m4 b/m4/amversion.m4 index 9fd3c1e0c..5f1f2b7ce 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -18,7 +18,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' 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.11], [], +m4_if([$1], [1.11.0a], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -34,7 +34,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.11])dnl +[AM_AUTOMAKE_VERSION([1.11.0a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |