Factor version munging capabilities out of release.sh.

[openocd] / bootstrap

diff --git a/bootstrap b/bootstrap
index 2e7b5329fb853bfec036e99d872bc54c426b3404..7684dc48c11847940a44e6f13c46bcdd091d0ba0 100755 (executable)
--- 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,13 +14,13 @@ 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
+# 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 ....'"