From 0d3328321b5533e98fc6dd501f439fcaf7aca534 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 31 Oct 2013 14:10:25 +0000
Subject: [PATCH 01/17] autogen.sh: don't override Automake version

We now require 1.12, so explicitly selecting 1.11 makes no sense.
---
 autogen.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 58ee191..4492665 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,20 +3,6 @@ set -e
 
 intltoolize --force --copy --automake || exit 1
 gtkdocize || exit 1
-
-if test -n "$AUTOMAKE"; then
-    : # don't override an explicit user request
-elif automake-1.11 --version >/dev/null 2>/dev/null && \
-     aclocal-1.11 --version >/dev/null 2>/dev/null; then
-    # If we have automake-1.11, use it. This is the oldest version (=> least
-    # likely to introduce undeclared dependencies) that will give us
-    # --enable-silent-rules support.
-    AUTOMAKE=automake-1.11
-    export AUTOMAKE
-    ACLOCAL=aclocal-1.11
-    export ACLOCAL
-fi
-
 autoreconf -i -f
 
 run_configure=true
-- 
1.8.4.rc3