X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=071ee2b0ac40300ec09568f6dd6662ca6422b8d5;hp=7684dc48c11847940a44e6f13c46bcdd091d0ba0;hb=d8ece229f9f06e66ad994ca996148912dc0b76b5;hpb=8a162e5e063fbbd6be04568e29633fad8f8b6720

diff --git a/bootstrap b/bootstrap
index 7684dc48c1..071ee2b0ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,9 @@
 #!/bin/sh -e
 # Run the autotools bootstrap sequence to create the configure script
 
+# 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
@@ -23,4 +26,15 @@ 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 ....'"
+
+if [ -n $1 ] || [ $1 != nosubmodule ]
+then
+    echo "Setting up submodules"
+    git submodule init
+    git submodule update
+else
+    echo "Skipping submodule setup"
+fi
+
+echo "Bootstrap complete. Quick start build instructions:"
+echo "./configure --enable-maintainer-mode ...."