X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=bootstrap;h=071ee2b0ac40300ec09568f6dd6662ca6422b8d5;hb=1b9e80f7e6359d59b68a7741c046722bb235a311;hp=d5a808e8e944a4be0379cb26557bd37fc7fd734d;hpb=002fdcf016e89b4f77be3afe9884dfe886f3cdd1;p=openocd.git

diff --git a/bootstrap b/bootstrap
index d5a808e8e9..071ee2b0ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,40 @@
-aclocal \
-&& autoheader \
-&& automake --foreign --add-missing --copy \
-&& autoconf
+#!/bin/sh -e
+# Run the autotools bootstrap sequence to create the configure script
 
-# AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode
+# Stop execution as soon as we have an unknown command
+set -e
+
+if libtoolize --version >/dev/null 2>&1; then
+	libtoolize="libtoolize"
+elif glibtoolize --version >/dev/null 2>&1; then
+	libtoolize="glibtoolize"
+else
+	echo "libtool is required" >&2
+	exit 1
+fi
+
+# bootstrap the autotools
+(
+set -x
+aclocal
+${libtoolize} --automake --copy
+autoconf
+autoheader
+automake --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; you can './configure --enable-maintainer-mode ....'"
+
+if [ -n $1 ] || [ $1 != nosubmodule ]
+then
+    echo "Setting up submodules"
+    git submodule init
+    git submodule update
+else
+    echo "Skipping submodule setup"
+fi
+
+echo "Bootstrap complete. Quick start build instructions:"
+echo "./configure --enable-maintainer-mode ...."