X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=e81ba4d02d0ad3fd5e203c335617b75886a8638d;hp=3452a315277f444a4f9ad7cd25405ecc920c178f;hb=4a5045b143cad3b0bdba7c5590504bfc19e9a627;hpb=c40571e6b9c2f4b181e289dbac2366569f128828

diff --git a/bootstrap b/bootstrap
index 3452a31527..e81ba4d02d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,37 +1,51 @@
-#!/bin/sh -e
+#!/bin/sh
 # Run the autotools bootstrap sequence to create the configure script
 
-# Stop execution as soon as we have an unknown command
+# Abort execution on error
 set -e
 
-if libtoolize --version >/dev/null 2>&1; then
-	libtoolize="libtoolize"
-elif glibtoolize --version >/dev/null 2>&1; then
-	libtoolize="glibtoolize"
+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
 (
 set -x
-aclocal
+aclocal --warnings=all
+# Apparently, not all versions of libtoolize support option --warnings=all .
 ${libtoolize} --automake --copy
-autoconf
-autoheader
-automake --gnu --add-missing --copy
+autoconf --warnings=all
+autoheader --warnings=all
+automake --warnings=all --gnu --add-missing --copy
 )
 
-# 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. Quick start build instructions:"
-echo "" 
-echo "1. Fetch Jim Tcl"
-echo ""
-echo "git submodule init"
-echo "git submodule update"
-echo ""
-echo "2. Configure"
-echo "./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
+
+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 ...."