X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=bootstrap;h=3b60fc6e5d1f5f2ce9a271ab679a331bdfd55690;hp=071ee2b0ac40300ec09568f6dd6662ca6422b8d5;hb=b16a7f9f6e3c7c417fa3d0d0bf042f032ee446f6;hpb=37f4978f95a989d6bfcaf9aff354ee23a0855b92

diff --git a/bootstrap b/bootstrap
index 071ee2b0ac..3b60fc6e5d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,16 +1,24 @@
-#!/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
@@ -23,18 +31,13 @@ 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
-
-if [ -n $1 ] || [ $1 != nosubmodule ]
-then
+if [ -n "$SKIP_SUBMODULE" ]; then
+    echo "Skipping submodule setup"
+else
     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 ...."
+echo "Bootstrap complete. Quick build instructions:"
+echo "./configure ...."