move foreign into the Makefile.am

[chaz/openbox] / bootstrap

diff --git a/bootstrap b/bootstrap
index 4abed495171419a8792686f736932b75749f654f..c83eebac6a212b88bf79b6fa4ad1f2fdf5414461 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4,12 +4,14 @@ sh() {
   /bin/sh -c "set -x; $*"
 }
 
-#sh autopoint --force # for GNU gettext
+export WANT_AUTOMAKE=1.7
+
+sh autopoint --force # for GNU gettext
 sh libtoolize --copy --force --automake
-sh aclocal -I m4 -I /usr/local/share/aclocal
+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