X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=ad5e7bdd21503a64b657eee9048e1a25023665bd;hp=b49fda3244058bda5cb46d890baae3ecbb2ef44e;hb=a5fe9d6e24fc98ef2c97a97fe4c2e1c9b5e1a181;hpb=647e61cc6d9b13dd2799d2302ce9289a1627e36c

diff --git a/bootstrap b/bootstrap
index b49fda3244..ad5e7bdd21 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,50 @@
-aclocal \
-&& autoheader \
-&& libtoolize --automake \
-&& automake --foreign --add-missing --copy \
-&& autoconf
-
-# AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode
-# otherwise the documentation will fail to build due to missing version.texi
-echo "Bootstrap complete; you can './configure --enable-maintainer-mode ....'"
+#!/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 ...."