From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 23 Aug 2009 04:52:44 +0000 (+1200)
Subject: Always display auto-tools versions on bootstrap.
X-Git-Tag: SQUID_3_0_STABLE19~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f09a9dd43403fd42cd7e6ab61348d21a2830e896;p=thirdparty%2Fsquid.git

Always display auto-tools versions on bootstrap.

This will better help us identify from build-farm results if we broke a
particular auto-tool support or if its the specific OS implementation /
environment.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 1407e745d0..f79177290e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -16,7 +16,30 @@ check_version()
   eval $2 --version 2>/dev/null | grep -i "$1.*$3" >/dev/null
 }
 
-find_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
+}
+
+find_variant()
 {
   tool=$1
   found="NOT_FOUND"
@@ -53,16 +76,21 @@ bootstrap() {
 }
 
 # Adjust paths of required autool packages
-amver=`find_version automake ${amversions}`
-acver=`find_version autoconf ${acversions}`
-ltver=`find_version libtool ${ltversions}`
+amver=`find_variant automake ${amversions}`
+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}`
 
 # Set environment variable to tell automake which autoconf to use.
 AUTOCONF="autoconf${acver}" ; export AUTOCONF
 
-echo "automake : $amver"
-echo "autoconfg: $acver"
-echo "libtool  : $ltver"
+echo "automake ($amversion) : automake$amver"
+echo "autoconf ($acversion) : autoconf$acver"
+echo "libtool  ($ltversion) : libtool$ltver"
 
 for dir in \
 	"" \