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

diff --git a/Makefile.am b/Makefile.am
index 248f53ec56fa12e42a70dc8e5d666e6fc112d27d..62535b250de4bb3455de77522cea195a7387677c 100644 (file)
--- 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 8d3416930fed096b4de8dcc812e484f89ac193df..166f66ed7036f643bd99fd972b3cc2f0aecd1dfc 100755 (executable)
--- 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"