luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Accept automake 1.10, too

Browse Source 
svn path=/trunk/; revision=5831
This commit is contained in:
Matthias Clasen 2007-11-09 01:57:26 +00:00
parent 799abb1a77
commit 6181cd47e2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,9 +1,12 @@
2007-11-08 Matthias Clasen <mclasen@redhat.com> 2007-11-08 Matthias Clasen <mclasen@redhat.com>
* autogen.sh: Accept automake 1.10, too
* mkinstalldirs: Temporarily add this script, to fix building * mkinstalldirs: Temporarily add this script, to fix building
from svn. from svn.
* Makefile.am: Use MKDIRS_P instead of mkinstalldirs. * Makefile.am: Use MKDIRS_P instead of mkinstalldirs, add
ChangeLog.pre-2-14 and mkinstalldirs to EXTRA_DIST.
2007-11-08 Matthias Clasen <mclasen@redhat.com> 2007-11-08 Matthias Clasen <mclasen@redhat.com>

8
autogen.sh
View File

@ -48,13 +48,17 @@ fi
if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.9 AUTOMAKE=automake-1.9
ACLOCAL=aclocal-1.9 ACLOCAL=aclocal-1.9
else else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.10
ACLOCAL=aclocal-1.10
else
echo echo
echo "You must have automake 1.9.x installed to compile $PROJECT." echo "You must have automake 1.9.x or 1.10.x installed to compile $PROJECT."
echo "Install the appropriate package for your distribution," echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
DIE=1 DIE=1
fi fi
fi
if test "$DIE" -eq 1; then if test "$DIE" -eq 1; then
exit 1 exit 1