X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=blobdiff_plain;f=bootstrap;h=6a5b10fb6cbe143e9aa9321485ba661deded1b60;hp=f0e2b2b0d8d2caa29ae7a906ad9de8fc5cd7a126;hb=fc120a75308855b738a42b1fde9d6e0d276f3bf9;hpb=51ff1497487dc9c5c9255c1e01f03d5012a5c3fe

diff --git a/bootstrap b/bootstrap
index f0e2b2b..6a5b10f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,12 +4,14 @@ sh() {
   /bin/sh -c "set -x; $*"
 }
 
-sh autopoint --force # for GNU gettext
-sh libtoolize --copy --force --automake
-sh aclocal -I m4
-sh autoheader
-sh autoconf
-sh automake --foreign --include-deps --add-missing --copy
+export WANT_AUTOMAKE=1.9
+
+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