X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=071ee2b0ac40300ec09568f6dd6662ca6422b8d5;hp=c01b7e488468aadf07b21ece85245f63573f4391;hb=6d6837f988cbce26de0195ad69736241501cdb0e;hpb=3aa4e9ebf6fa2ceeadd24ed78cd5fac49117a620

diff --git a/bootstrap b/bootstrap
index c01b7e4884..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
@@ -17,9 +20,21 @@ aclocal
 ${libtoolize} --automake --copy
 autoconf
 autoheader
-automake --foreign --add-missing --copy
+automake --gnu --add-missing --copy
 )
 
-# AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode
+# 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 ...."