Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gtk2-am116' into 'gtk-2-24'

Browse Source 
build: support automake 1.16

See merge request GNOME/gtk!88
This commit is contained in:
Matthias Clasen
2018-03-30 20:43:17 +00:00
parent 98687be562 2dbf31c0ea
commit 84a665f7f7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autogen.sh
View File

@@ -48,7 +48,10 @@ fi
DIE=1
}
if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.16
ACLOCAL=aclocal-1.16
else 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
@@ -71,8 +74,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, 1.14.x"
echo "or 1.15.x 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 "1.15.x or 1.16.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
@@ -83,6 +86,7 @@ fi
fi
fi
fi
fi
if test "$DIE" -eq 1; then
exit 1