From 4712e3980c9729d7af23c69bf6aa4610eaf80a2b Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Mon, 8 Dec 2003 23:18:12 +0000 Subject: Update automake checks to check incremental versions in the correct order, 2003-12-08 Rodney Dawes * autogen.sh: Update automake checks to check incremental versions in the correct order, Fixes #128691 svn path=/trunk/; revision=3071 --- macros2/ChangeLog | 5 +++++ macros2/autogen.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/macros2/ChangeLog b/macros2/ChangeLog index 895c7f5..f8533ad 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,8 @@ +2003-12-08 Rodney Dawes + + * autogen.sh: Update automake checks to check incremental + versions in the correct order, Fixes #128691 + 2003-11-19 Malcolm Tredinnick * autogen.sh: Replace use of -or in a find command with -o. diff --git a/macros2/autogen.sh b/macros2/autogen.sh index 598edc5..bdde708 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -249,8 +249,8 @@ 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.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.7 automake-1.6" ;; + 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7" ;; + 1.6*) automake_progs="automake-1.6 automake-1.7" ;; 1.7*) automake_progs="automake-1.7" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ -- cgit v1.2.1