[gentoo-commits] proj/autotools-wrappers:main commit in: /

[Mike Frysinger]

commit:     04fb5b54e8dea2aa16a53032f55f672dc7d547be
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 08:45:59 2022 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 08:45:59 2022 +0000
URL:        https://gitweb.gentoo.org/proj/autotools-wrappers.git/commit/?id=04fb5b54

autoconf-wrapper: expand full version range only on demand

Sync the automake behavior to autoconf where we expand all possible
versions only if the current ones not found.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 ac-wrapper.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ac-wrapper.sh b/ac-wrapper.sh
index 37eb7b7..4471f30 100755
--- a/ac-wrapper.sh
+++ b/ac-wrapper.sh
@@ -75,10 +75,10 @@ fi
 
 #
 # Set up bindings between actual version and WANT_AUTOCONF;
-# Start at last known unstable/stable versions to speed up lookup process.
+# Start with last known versions to speed up lookup process.
 #
-KNOWN_AUTOCONF="2.71 2.70 2.69"
-vers="${KNOWN_AUTOCONF} 9999 $(printf '2.%s ' `seq 99 -1 59`) 2.13"
+LAST_KNOWN_VER="71"
+vers=$(printf '2.%s ' `seq ${LAST_KNOWN_VER} -1 50`)
 
 #
 # Helper to scan for a usable program based on version.
@@ -106,7 +106,10 @@ find_binary() {
 # list of autoconf versions.
 #
 find_latest() {
-	find_binary ${vers}
+	if ! find_binary ${vers} ; then
+		# Brute force it.
+		find_binary $(printf '2.%s ' `seq 99 -1 ${LAST_KNOWN_VER}`) 9999
+	fi
 }
 for wx in ${WANT_AUTOCONF:-latest} ; do
 	if [ "${wx}" = "latest" ] || [ "${wx}" = "2.5" ] ; then