oops... I'm combining two different things in this commit... so I'll try be clear

[chaz/openbox] / bootstrap

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