[gtk+] Accept automake 1.10 and 1.11
- From: Matthias Clasen <matthiasc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+] Accept automake 1.10 and 1.11
- Date: Fri, 4 Sep 2009 15:55:13 +0000 (UTC)
commit 76dab7b3b745c285f814311b071fefc8244d5245
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Sep 4 11:52:55 2009 -0400
Accept automake 1.10 and 1.11
This was tested to work in bug 588788.
autogen.sh | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index d3fb066..66e4f03 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -45,16 +45,24 @@ fi
DIE=1
}
-if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+ AUTOMAKE=automake-1.11
+ ACLOCAL=aclocal-1.11
+else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
+ AUTOMAKE=automake-1.10
+ ACLOCAL=aclocal-1.10
+else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.7
ACLOCAL=aclocal-1.7
else
echo
- echo "You must have automake 1.7.x installed to compile $PROJECT."
+ echo "You must have automake 1.7.x, 1,10.x or 1.11.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
+fi
if test "$DIE" -eq 1; then
exit 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]