Make automake 1.10 work too.

2006-12-01  Kjartan Maraas  <kmaraas@gnome.org>

	* macros2/gnome-autogen.sh: Make automake 1.10 work too.

svn path=/trunk/; revision=3894

diff --git a/ChangeLog b/ChangeLog
index ac89fc3..925c8a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * macros2/gnome-autogen.sh: Make automake 1.10 work too.
+
 2006-10-20  Bastien Nocera  <hadess@hadess.net>
 
        * macros2/gnome-autogen.sh: exit from the check_m4macros function as

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 6a69fc5..ccd0560 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -300,11 +300,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.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-    1.6*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-    1.7*) automake_progs="automake-1.9 automake-1.8 automake-1.7" ;;
-    1.8*) automake_progs="automake-1.9 automake-1.8" ;;
-    1.9*) automake_progs="automake-1.9" ;;
+    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
+    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
+    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