telepathy-logger: autogen.sh: don't override Automake version

Simon McVittie smcv at kemper.freedesktop.org
Thu Nov 7 19:41:30 CET 2013


Module: telepathy-logger
Branch: master
Commit: 6f0aa1b90f94806611dd8b85cade68d645ef82fe
URL:    http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=6f0aa1b90f94806611dd8b85cade68d645ef82fe

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Oct 31 14:10:25 2013 +0000

autogen.sh: don't override Automake version

We now require 1.12, so explicitly selecting 1.11 makes no sense.

(cherry picked from commit 0d3328321b5533e98fc6dd501f439fcaf7aca534)

Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71100
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70269

---

 autogen.sh |   14 --------------
 1 files changed, 0 insertions(+), 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



More information about the telepathy-commits mailing list