summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xautogen.sh11
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d2c4283..41d476a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-14 Kjartan Maraas <kmaraas@gnome.org>
+
+ * autogen.sh: Make this work with automake 1.10 too.
+
2006-11-18 Johan Dahlin <jdahlin@async.com.br>
* configure.ac: Post release version bump
diff --git a/autogen.sh b/autogen.sh
index 90ebfc1..f3462d7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -297,11 +297,12 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
case $REQUIRED_AUTOMAKE_VERSION in
1.4*) automake_progs="automake-1.4" ;;
- 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
- 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
- 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;;
- 1.8*) automake_progs="automake-1.8 automake-1.9" ;;
- 1.9*) automake_progs="automake-1.9" ;;
+ 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
+ 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
+ 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;;
+ 1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10" ;;
+ 1.9*) automake_progs="automake-1.9 automake-1.10" ;;
+ 1.10*) automake_progs="automake-1.10" ;;
esac
version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
"http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1