From: Stefano Lattarini Date: Thu, 26 Apr 2012 15:52:31 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.12b~165 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: maint: don't use "union" merge driver for NEWS anymore build: avoid too greedy rebuilds in the testsuite tests: avoid yet another spurious environment influence tests: fix a failure in Lex/C++ tests on Mac OS X tests: fix a spurious failure due to truncated timestamps build: require autoconf 2.69 build: don't require minimal automake version in AM_INIT_AUTOMAKE Signed-off-by: Stefano Lattarini --- 8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69 diff --cc configure.ac index 1885836fd,22a158f69..3f55df734 --- a/configure.ac +++ b/configure.ac @@@ -15,8 -15,8 +15,8 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - AC_PREREQ([2.68]) + AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.12.0a], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.12a], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([automake.in]) AC_CONFIG_AUX_DIR([lib])