Prefer newer versions of Automake. From bug #305641.

2005-09-20  Stepan Kasal  <kasal@ucw.cz>

	* macros2/gnome-autogen.sh: Prefer newer versions of Automake.
	From bug #305641.

svn path=/trunk/; revision=3772

diff --git a/ChangeLog b/ChangeLog
index f7f74b0..1d87e20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-20  Stepan Kasal  <kasal@ucw.cz>
+
+       * macros2/gnome-autogen.sh: Prefer newer versions of Automake.
+       From bug #305641.
+
 2005-09-20  James Henstridge  <james@jamesh.id.au>
 
        * configure.in: bump version to 2.12.0

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 1ddfdb1..448aa1c 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -289,10 +289,10 @@ 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.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" ;;
 esac
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \