summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2012-08-06 11:29:58 +0200
committerRobert Bragg <robert@linux.intel.com>2012-08-15 13:46:25 +0100
commit0e69a6414f2fcc850c5213fbc14ecea45c366ce9 (patch)
tree410c277ae923b1320c4c8e9386a1318b96ab4b85
parent19ccb72b80257c6ff480f83e997f567f69703209 (diff)
downloadcogl-0e69a6414f2fcc850c5213fbc14ecea45c366ce9.tar.gz
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)
-rwxr-xr-xautogen.sh27
1 files changed, 16 insertions, 11 deletions
diff --git a/autogen.sh b/autogen.sh
index 09d66afc..9219f85e 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 || {