From: hno <>
Date: Sat, 5 Oct 2002 14:03:12 +0000 (+0000)
Subject: Ported the autotools version checks from 2.5, both to allow bootstrapping
X-Git-Tag: SQUID_3_0_PRE1~707
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74b984b629f50f2a1b0a3b547fbd5e582c24e690;p=thirdparty%2Fsquid.git

Ported the autotools version checks from 2.5, both to allow bootstrapping
until the code is updated, and to allow easier use by developers who
may have other default versions.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 979a9650f2..e9020266fd 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,9 +1,12 @@
-#! /bin/sh
+#!/bin/sh
 # Used to setup the configure.in, autoheader and Makefile.in's if configure
 # has not been generated. This script is only needed for developers when
 # configure has not been run, or if a Makefile.am in a non-configured directory
 # has been updated
 
+# Autotool versions required
+acver="2.13"
+amver="1.5"
 
 bootstrap() {
   if "$@"; then
@@ -19,10 +22,20 @@ bootstrap() {
 # Make sure cfgaux exists
 mkdir -p cfgaux
 
+# Adjust paths of required autool packages
+if autoconf --version | grep -q $acver; then
+  acver=""
+fi
+if automake --version | grep -q $amver; then
+  amver=""
+fi
+acver=`echo $acver | sed -e 's/\.//'`
+amver=`echo $amver | sed -e 's/\.//'`
+
 # Bootstrap the autotool subsystems
-bootstrap aclocal
-bootstrap autoheader
-bootstrap automake --foreign --add-missing
-bootstrap autoconf
+bootstrap aclocal$amver
+bootstrap autoheader$acver
+bootstrap automake$amver --foreign --add-missing
+bootstrap autoconf$acver
 
 echo "Autotool bootstrapping complete."