Merge branch 'master' into chaz

[chaz/openbox] / bootstrap

diff --git a/bootstrap b/bootstrap
index 3c3044d3499831adbe75a8d7ce9d4a4f2ec5cabf..076005ccf2d5f38af47a63a37aa0fd9963468876 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4,10 +4,14 @@ sh() {
   /bin/sh -c "set -x; $*"
 }
 
-sh autoheader
-sh aclocal
-sh automake --foreign --include-deps --add-missing
-sh autoconf
+export WANT_AUTOMAKE=1.11
+
+sh autopoint --force || exit 1 # for GNU gettext
+sh libtoolize --copy --force --automake || exit 1
+sh aclocal -I m4 $ACLOCAL_FLAGS || exit 1
+#sh autoheader || exit 1
+sh autoconf || exit 1
+sh automake --include-deps --add-missing --copy || exit 1
 
 echo
 echo You are now ready to run ./configure