diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 71cab72..61172c2 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -343,18 +343,7 @@ for configure_ac in $configure_files; do fi done -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.12" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ +version_check automake AUTOMAKE "automake $AUTOMAKE automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`