X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=bootstrap;h=3452a315277f444a4f9ad7cd25405ecc920c178f;hb=740b9e25b410c164e661d0334a9ea4168406726b;hp=b49fda3244058bda5cb46d890baae3ecbb2ef44e;hpb=647e61cc6d9b13dd2799d2302ce9289a1627e36c;p=openocd.git

diff --git a/bootstrap b/bootstrap
index b49fda3244..3452a31527 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,37 @@
-aclocal \
-&& autoheader \
-&& libtoolize --automake \
-&& automake --foreign --add-missing --copy \
-&& autoconf
+#!/bin/sh -e
+# Run the autotools bootstrap sequence to create the configure script
 
-# AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode
+# Stop execution as soon as we have an unknown command
+set -e
+
+if libtoolize --version >/dev/null 2>&1; then
+	libtoolize="libtoolize"
+elif glibtoolize --version >/dev/null 2>&1; then
+	libtoolize="glibtoolize"
+else
+	echo "libtool is required" >&2
+	exit 1
+fi
+
+# bootstrap the autotools
+(
+set -x
+aclocal
+${libtoolize} --automake --copy
+autoconf
+autoheader
+automake --gnu --add-missing --copy
+)
+
+# AM_MAINTAINER_MODE requires --enable-maintainer-mode from everyone using
+# current source snapshots (working from GIT, or some source snapshot, etc)
 # otherwise the documentation will fail to build due to missing version.texi
-echo "Bootstrap complete; you can './configure --enable-maintainer-mode ....'"
+echo "Bootstrap complete. Quick start build instructions:"
+echo "" 
+echo "1. Fetch Jim Tcl"
+echo ""
+echo "git submodule init"
+echo "git submodule update"
+echo ""
+echo "2. Configure"
+echo "./configure --enable-maintainer-mode ...."