X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=bootstrap;h=071ee2b0ac40300ec09568f6dd6662ca6422b8d5;hb=a7844aa4e83481a66fd5df8f33956da586d2f880;hp=2e7b5329fb853bfec036e99d872bc54c426b3404;hpb=3df27e5ce5bb4c62839370f67ea3fd78f987e84d;p=openocd.git

diff --git a/bootstrap b/bootstrap
index 2e7b5329fb..071ee2b0ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,12 @@
 #!/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 libtoolize --version >/dev/null 2>&1; then
+elif glibtoolize --version >/dev/null 2>&1; then
 	libtoolize="glibtoolize"
 else
 	echo "libtool is required" >&2
@@ -13,13 +17,24 @@ fi
 (
 set -x
 aclocal
-autoheader
 ${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 ...."