diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-10-29 12:35:39 +0100 |
---|---|---|
committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-10-29 12:35:39 +0100 |
commit | d8b09e8fb3846d7c02a8e8dc4dd9b9f7aebfe8a7 (patch) | |
tree | 7117f5d9a9945378601c7f1561b67c9abcf68c86 /autogen.sh | |
parent | 46bdd911fafe82a0c5da418da318707ef8cae9f6 (diff) |
configure: use automake 1.11
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -3,13 +3,13 @@ set -e if test -n "$AUTOMAKE"; then : # don't override an explicit user request -elif automake-1.9 --version >/dev/null 2>/dev/null && \ - aclocal-1.9 --version >/dev/null 2>/dev/null; then - # If we have automake-1.9, use it. This helps to ensure that our build - # system doesn't accidentally grow automake-1.10 dependencies. - AUTOMAKE=automake-1.9 +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 helps to ensure that our build + # system doesn't accidentally grow other dependencies. + AUTOMAKE=automake-1.11 export AUTOMAKE - ACLOCAL=aclocal-1.9 + ACLOCAL=aclocal-1.11 export ACLOCAL fi |