[next] telepathy-gabble: Stop trying to use automake-1.11

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 3 07:26:40 PDT 2014


Module: telepathy-gabble
Branch: next
Commit: 7bbbb3f241c92a9acfe924a9e02a09b86927a4d0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=7bbbb3f241c92a9acfe924a9e02a09b86927a4d0

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Mar 26 13:35:58 2014 +0000

Stop trying to use automake-1.11

---

 autogen.sh |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 59c531f..9588760 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,6 @@
 #!/bin/sh
 set -e
 
-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
 
 #Check if submodules should be enabled



More information about the telepathy-commits mailing list