From: robertc <>
Date: Sun, 2 Sep 2001 18:16:54 +0000 (+0000)
Subject: Require version 1.5 of automake, and have bootstrap.sh provide basic error feedback.
X-Git-Tag: SQUID_3_0_PRE1~1419
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b4468b699a392cc3e22b7fe781c9668942dd0b74;p=thirdparty%2Fsquid.git

Require version 1.5 of automake, and have bootstrap.sh provide basic error feedback.
---

diff --git a/Makefile.am b/Makefile.am
index 248f53ec56..62535b250d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.1 2001/08/31 11:19:05 robertc Exp $
+# $Id: Makefile.am,v 1.2 2001/09/02 12:16:54 robertc Exp $
 #
 
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects VERSION=1.5
 DIST_SUBDIRS	= lib snmplib scripts src icons errors contrib
 SUBDIRS		= lib @makesnmplib@ scripts src icons errors
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 8d3416930f..166f66ed70 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,7 +4,24 @@
 # configure has not been run, or if a Makefile.am in a non-configured directory
 # has been updated
 
-aclocal \
-&& autoheader \
-&& automake --foreign --add-missing \
-&& autoconf
+if ! ( aclocal ) ; then
+  echo "aclocal failed" 
+else
+  if ! ( autoheader ) ; then
+    echo "autoheader failed"
+  else
+    if ! ( automake --foreign --add-missing ) ; then
+      echo "automake failed"
+    else
+      if ! ( autoconf ) ; then
+	echo "autoconf failed"
+      else
+	echo "Autotool bootstrapping complete."
+	exit 0
+      fi
+    fi
+  fi
+fi
+
+echo "Autotool bootstrapping failed. You will need to investigate and correct" ;
+echo "before you can develop on this source tree"