From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 5 Dec 2010 02:23:25 +0000 (+0100)
Subject: Make bootstrap.sh use system default autotools versions instead of searching
X-Git-Tag: take1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9c6b272e2cde8b4ce2d763c31bab3125a165946;p=thirdparty%2Fsquid.git

Make bootstrap.sh use system default autotools versions instead of searching

can be overridden on commandline if needed. See bootstrap.sh for details.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 7073546b2e..d8e52332b1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,9 +7,9 @@
 # Autotool versions preferred. To override either edit the script
 # to match the versions you want to use, or set the variables on
 # the command line like "env acver=.. amver=... ./bootstrap.sh"
-acversions="${acver:-2.68 2.67 2.66 2.65 2.64 2.63 2.62 2.61}"
-amversions="${amver:-1.11 1.10 1.9}"
-ltversions="${ltver:-2.2}"
+acversions="${acver:-.}" # 2.68 2.67 2.66 2.65 2.64 2.63 2.62 2.61}"
+amversions="${amver:-.}" # 1.11 1.10 1.9}"
+ltversions="${ltver:-.}" # 2.2}"
 
 check_version()
 {
@@ -19,24 +19,8 @@ check_version()
 show_version()
 {
   tool=$1
-  found="NOT_FOUND"
-  shift
-  versions="$*"
-  for version in $versions; do
-    for variant in "" "-${version}" "`echo $version | sed -e 's/\.//g'`"; do
-      if check_version $tool ${tool}${variant} $version; then
-	found="${version}"
-	break
-      fi
-    done
-    if [ "x$found" != "xNOT_FOUND" ]; then
-      break
-    fi
-  done
-  if [ "x$found" = "xNOT_FOUND" ]; then
-    found="??"
-  fi
-  echo $found
+  variant=$2
+  ${tool}${variant} --version 2>/dev/null | head -1 | sed -e 's/.*) //'
 }
 
 find_variant()
@@ -122,9 +106,9 @@ acver=`find_variant autoconf ${acversions}`
 ltver=`find_variant libtool ${ltversions}`
 
 # Produce debug output about what version actually found.
-amversion=`show_version automake ${amversions}`
-acversion=`show_version autoconf ${acversions}`
-ltversion=`show_version libtool ${ltversions}`
+amversion=`show_version automake "${amver}"`
+acversion=`show_version autoconf "${acver}"`
+ltversion=`show_version libtool "${ltver}"`
 
 # Find the libtool path to get the right aclocal includes
 ltpath=`find_path libtool$ltver`