From 69770d53d434010bbcefa7f79ef93bc8f26f9a8d Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 13 Dec 2009 20:00:04 +0000
Subject: [PATCH] Switch automake version(s) to 1.10 from 1.9.

Originally committed to SVN as r3868.
---
 devel/tinderbox/buildbot/master/master.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/devel/tinderbox/buildbot/master/master.cfg b/devel/tinderbox/buildbot/master/master.cfg
index 093fb1f2c..a4a807249 100644
--- a/devel/tinderbox/buildbot/master/master.cfg
+++ b/devel/tinderbox/buildbot/master/master.cfg
@@ -206,10 +206,10 @@ ffbsd.addStep(shell.ShellCommand(
 	command=["./autogen.sh", "--skip-configure"],
 	env={
 		'ACLOCAL_FLAGS': '-I /usr/local/share/aclocal -I /usr/home/verm/build/wx/share/aclocal',
-		'ACLOCAL': 'aclocal-1.9',
+		'ACLOCAL': 'aclocal-1.10',
 		'AUTOCONF': 'autoconf-2.62',
 		'AUTOHEADER': 'autoheader-2.62',
-		'AUTOMAKE': 'automake-1.9',
+		'AUTOMAKE': 'automake-1.10',
 		'LIBTOOLIZE': 'libtoolize'
 	}
 ))
@@ -307,8 +307,8 @@ fosx.addStep(shell.ShellCommand(
 	command=["./autogen.sh", "--skip-configure"],
 	env={
 		'ACLOCAL_FLAGS': '-I /Users/verm/prefix/share/aclocal -I /Developer/usr/share/aclocal -I /opt/local/share/aclocal',
-		'AUTOMAKE': '/Users/verm/prefix/bin/automake-1.9',
-		'ACLOCAL': '/Users/verm/prefix/bin/aclocal-1.9',
+		'AUTOMAKE': '/Users/verm/prefix/bin/automake-1.10',
+		'ACLOCAL': '/Users/verm/prefix/bin/aclocal-1.10',
 		'AUTOCONF': '/Users/verm/prefix/bin/autoconf',
 		'AUTOHEADER': '/Users/verm/prefix/bin/autoheader',
 		'BIN_CONVERT': '/Users/verm/prefix/bin/convert'
@@ -414,8 +414,8 @@ fosx_ppc.addStep(shell.ShellCommand(
 	command=["./autogen.sh", "--skip-configure"],
 	env={
 		'ACLOCAL_FLAGS': '-I /Users/verm/prefix/share/aclocal',
-		'AUTOMAKE': '/Users/verm/prefix/bin/automake-1.9',
-		'ACLOCAL': '/Users/verm/prefix/bin/aclocal-1.9',
+		'AUTOMAKE': '/Users/verm/prefix/bin/automake-1.10',
+		'ACLOCAL': '/Users/verm/prefix/bin/aclocal-1.10',
 		'AUTOCONF': '/Users/verm/prefix/bin/autoconf-2.61',
 		'AUTOHEADER': '/Users/verm/prefix/bin/autoheader-2.61',
 		'BIN_CONVERT': '/Users/verm/prefix/bin/convert'