Support automake 1.15
https://bugzilla.gnome.org/show_bug.cgi?id=743544
This commit is contained in:
committed by
Matthias Clasen
parent
5364ede826
commit
dea9eae3af
10
autogen.sh
10
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
|
||||
|
||||
Reference in New Issue
Block a user