X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=8a3945e8f78724dbc30b08cf19965e4e64d6486a;hp=81c9804904efb3c128c4fd233202a67e73a05a0c;hb=a6cf60c9c2387ca9f6c5a916ebf3d164554a7165;hpb=70b15389962637f13f5f3f10a6beebabed419c69

diff --git a/bootstrap b/bootstrap
index 81c9804904..8a3945e8f7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,16 +1,24 @@
-#!/bin/sh -e
+#!/bin/sh
 # Run the autotools bootstrap sequence to create the configure script
 
-# Stop execution as soon as we have an unknown command
+# Abort execution on error
 set -e
 
-if libtoolize --version >/dev/null 2>&1; then
-	libtoolize="libtoolize"
-elif glibtoolize --version >/dev/null 2>&1; then
-	libtoolize="glibtoolize"
+if which libtoolize > /dev/null; then
+    libtoolize="libtoolize"
+elif which glibtoolize >/dev/null; then
+    libtoolize="glibtoolize"
 else
-	echo "libtool is required" >&2
-	exit 1
+    echo "$0: Error: libtool is required" >&2
+    exit 1
+fi
+
+if [ "$1" = "nosubmodule" ]; then
+    SKIP_SUBMODULE=1
+elif [ -n "$1" ]; then
+    echo "$0: Illegal argument $1"
+    echo "USAGE: $0 [nosubmodule]"
+    exit 1
 fi
 
 # bootstrap the autotools
@@ -26,16 +34,14 @@ 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. Quick start build instructions:"
-echo "" 
-echo "1. Build Jim Tcl"
-echo ""
-echo "git submodule init"
-echo "git submodule update"
-echo "cd jimtcl"
-echo "./configure --with-jim-ext=nvp"
-echo "make"
-echo "make install"
-echo ""
-echo "2. Configure"
+
+if [ -n "$SKIP_SUBMODULE" ]; then
+    echo "Skipping submodule setup"
+else
+    echo "Setting up submodules"
+    git submodule init
+    git submodule update
+fi
+
+echo "Bootstrap complete. Quick build instructions:"
 echo "./configure --enable-maintainer-mode ...."