X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=e81ba4d02d0ad3fd5e203c335617b75886a8638d;hp=f7c4c0facd40b1579f4ba45c13be099cfec136b1;hb=c1f4d9e6e8f9cdab122db36299e039a73151ffe4;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702

diff --git a/bootstrap b/bootstrap
index f7c4c0facd..e81ba4d02d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,51 @@
-aclocal \
-&& autoheader \
-&& automake --gnu --add-missing \
-&& 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 --warnings=all
+# Apparently, not all versions of libtoolize support option --warnings=all .
+${libtoolize} --automake --copy
+autoconf --warnings=all
+autoheader --warnings=all
+automake --warnings=all --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 ...."