X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=bootstrap;h=59f8438a7cbed484414d9f42e16a9051c9f0e95f;hb=45f03dd9b522cd0f5c96805fa14b24fa082355b0;hp=2e7b5329fb853bfec036e99d872bc54c426b3404;hpb=3df27e5ce5bb4c62839370f67ea3fd78f987e84d;p=openocd.git

diff --git a/bootstrap b/bootstrap
index 2e7b5329fb..59f8438a7c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,9 @@
 #!/bin/sh -e
+# Run the autotools bootstrap sequence to create the configure script
 
 if libtoolize --version >/dev/null 2>&1; then
 	libtoolize="libtoolize"
-elif libtoolize --version >/dev/null 2>&1; then
+elif glibtoolize --version >/dev/null 2>&1; then
 	libtoolize="glibtoolize"
 else
 	echo "libtool is required" >&2
@@ -13,11 +14,10 @@ fi
 (
 set -x
 aclocal
-autoheader
 ${libtoolize} --automake --copy
 autoconf
 autoheader
-automake --foreign --add-missing --copy
+automake --gnu --add-missing --copy
 )
 
 # AM_MAINTAINER_MODE requires SVN users provide --enable-maintainer-mode