Add some foo to handle automake-1.9.x too.

2004-08-16  Kjartan Maraas  <kmaraas@gnome.org>

	* gnome-autogen.sh: Add some foo to handle automake-1.9.x too.

svn path=/trunk/; revision=3473

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 21681d9..24f6f50 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-16  Kjartan Maraas  <kmaraas@gnome.org>
+
+       * gnome-autogen.sh: Add some foo to handle automake-1.9.x too.
+
 2004-05-13  James Henstridge  <james@daa.com.au>
 
        * autogen.sh: Change the order the various tools are called in to

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 05f001b..3c6dee9 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -261,10 +261,11 @@ 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" ;;
-    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8" ;;
-    1.7*) automake_progs="automake-1.7 automake-1.8" ;;
-    1.8*) automake_progs="automake-1.8" ;;
+    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" ;;
 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