X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=8a3945e8f78724dbc30b08cf19965e4e64d6486a;hp=c01b7e488468aadf07b21ece85245f63573f4391;hb=74db7f9681c960c18c1ce2e3d317d931aaefe713;hpb=3aa4e9ebf6fa2ceeadd24ed78cd5fac49117a620

diff --git a/bootstrap b/bootstrap
index c01b7e4884..8a3945e8f7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,13 +1,24 @@
-#!/bin/sh -e
+#!/bin/sh
 # Run the autotools bootstrap sequence to create the configure script
 
-if libtoolize --version >/dev/null 2>&1; then
-	libtoolize="libtoolize"
-elif glibtoolize --version >/dev/null 2>&1; then
-	libtoolize="glibtoolize"
+# Abort execution on error
+set -e
+
+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
@@ -17,9 +28,20 @@ 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 "$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 ...."