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

diff --git a/bootstrap b/bootstrap
index b49fda3244..7684dc48c1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,26 @@
-aclocal \
-&& autoheader \
-&& libtoolize --automake \
-&& 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
+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 ....'"