summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-27 09:10:07 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-27 09:20:04 +0000
commite070539b651a5873daeeb4a23bdd68ac7859dadf (patch)
tree6d0f6b5bcadc0d6c8788af01f0f46723ebb76164
parentc652cf42d7893caa67533e078781fbabc0d1decf (diff)
autogen.sh: stop trying to use an obsolete Automake versionnext-misc
This is 1.0, let's be a little less backwards-compatible.
-rwxr-xr-xautogen.sh13
1 files changed, 0 insertions, 13 deletions
diff --git a/autogen.sh b/autogen.sh
index 5c3d0843..33eb9dff 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,19 +4,6 @@ set -e
echo 'Running gtkdocize'
gtkdocize
-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
-
echo 'Running autoreconf -i --force'
autoreconf -i --force