summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2007-11-09 01:57:26 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-11-09 01:57:26 +0000
commit6181cd47e23b3a09c91e6136adc30c493d8ad26e (patch)
tree5c17228ba7578a9fac9e412e92df3a6844af3094 /autogen.sh
parent799abb1a77ce7f95f1bc435931c0cf77286cf416 (diff)
Accept automake 1.10, too
svn path=/trunk/; revision=5831
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index f8663616d..7e5885cb1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,13 +48,17 @@ fi
if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-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 "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 "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
DIE=1
fi
+fi
if test "$DIE" -eq 1; then
exit 1