diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-31 14:10:25 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-07 18:20:03 +0000 |
| commit | 6f0aa1b90f94806611dd8b85cade68d645ef82fe (patch) | |
| tree | f97e9347abd2d3ce01c854163b687929c4e7b83d | |
| parent | ce1aefeb329be9504992078c30aad9d5b034fa1d (diff) | |
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@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71100
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70269
| -rwxr-xr-x | autogen.sh | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -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 |