summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-26 13:35:58 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-26 13:35:58 +0000
commit7bbbb3f241c92a9acfe924a9e02a09b86927a4d0 (patch)
tree014069deac0ce992096357ef621542b9191f01a4
parent4fad8aa4dc7883b224391f4420f9d355b1a7d320 (diff)
Stop trying to use automake-1.11next-tests
-rwxr-xr-xautogen.sh13
1 files changed, 0 insertions, 13 deletions
diff --git a/autogen.sh b/autogen.sh
index 59c531ff9..958876006 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