summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh10
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