[cogl/wip/rib/cogl-1.12: 134/139] Support building with automake 1.12.x
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/rib/cogl-1.12: 134/139] Support building with automake 1.12.x
- Date: Wed, 15 Aug 2012 13:14:42 +0000 (UTC)
commit 0e69a6414f2fcc850c5213fbc14ecea45c366ce9
Author: Stef Walter <stefw gnome org>
Date: Mon Aug 6 11:29:58 2012 +0200
Support building with automake 1.12.x
https://bugzilla.gnome.org/show_bug.cgi?id=681285
Reviewed-by: Neil Roberts <neil linux intel com>
(cherry picked from commit e5b5c5017487cec6426c93c364ff853831bc2080)
autogen.sh | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 09d66af..9219f85 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,17 +20,22 @@ test $TEST_TYPE $FILE || {
# https://bugzilla.gnome.org/show_bug.cgi?id=661128
touch -t 200001010000 po/cogl.pot
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
- AUTOMAKE=automake-1.11
- ACLOCAL=aclocal-1.11
- export AUTOMAKE ACLOCAL
-else
- echo
- echo "You must have automake 1.11.x installed to compile $PROJECT
-ECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- exit 1
+AUTOMAKE_VERSIONS="1.12 1.11"
+for version in $AUTOMAKE_VERSIONS; do
+ if automake-$version --version < /dev/null > /dev/null 2>&1 ; then
+ AUTOMAKE=automake-$version
+ ACLOCAL=aclocal-$version
+ export AUTOMAKE ACLOCAL
+ break
+ fi
+done
+
+if test -z "$AUTOMAKE"; then
+ echo
+ echo "You must have one of automake $AUTOMAKE_VERSIONS to compile $PROJECT."
+ echo "Install the appropriate package for your distribution,"
+ echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+ exit 1
fi
(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]