X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=ad5e7bdd21503a64b657eee9048e1a25023665bd;hp=9fd3866e19e1fe3bb180beb10b8e5155f68eb7b6;hb=96903e6df43e2bc967267e034edf15a7c274d044;hpb=df4b030df770e905aae573b4825d62b3efc96515

diff --git a/bootstrap b/bootstrap
index 9fd3866e19..ad5e7bdd21 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,50 @@
-aclocal \
-&& autoheader \
-&& automake --foreign --add-missing --copy \
-&& autoconf
+#!/bin/sh
+# Run the autotools bootstrap sequence to create the configure script
+
+# Abort execution on error
+set -e
+
+if which libtoolize > /dev/null; then
+    libtoolize="libtoolize"
+elif which glibtoolize >/dev/null; then
+    libtoolize="glibtoolize"
+else
+    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
+(
+set -x
+aclocal
+${libtoolize} --automake --copy
+autoconf
+autoheader
+automake --gnu --add-missing --copy
+)
+
+if [ -n "$SKIP_SUBMODULE" ]; then
+    echo "Skipping submodule setup"
+else
+    echo "Setting up submodules"
+    git submodule init
+    git submodule update
+fi
+
+if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then
+    (
+    cd src/jtag/drivers/libjaylink
+    ./autogen.sh
+    )
+fi
+
+echo "Bootstrap complete. Quick build instructions:"
+echo "./configure ...."