diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2015-02-13 14:15:00 +0000 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2015-02-13 14:15:00 +0000 |
| commit | 308c6f0cd5f15ee62ee97522b35f26f331113cad (patch) | |
| tree | 91c96bd3edd31ab4811aee9867b793181b329b35 | |
| parent | 7f99fdbe909e7fc1c9bc781426eaccd79ef8bd8e (diff) | |
| download | gtk+-baserock/tlsa/2.24.25+automake115_fix.tar.gz | |
Allow building with automake 1.15baserock/tlsa/2.24.25+automake115_fix
| -rwxr-xr-x | autogen.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh index fba24724a6..078f483f5a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,7 +48,10 @@ fi DIE=1 } -if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then +if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake-1.15 + ACLOCAL=aclocal-1.15 +else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then AUTOMAKE=automake-1.14 ACLOCAL=aclocal-1.14 else if automake-1.13 --version < /dev/null > /dev/null 2>&1 ; then @@ -68,8 +71,8 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then ACLOCAL=aclocal-1.7 else echo - echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x or 1.14.x" - echo "installed to compile $PROJECT." + echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x" + echo "or 1.15.x installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" DIE=1 @@ -79,6 +82,7 @@ fi fi fi fi +fi if test "$DIE" -eq 1; then exit 1 |