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

diff --git a/bootstrap b/bootstrap
index c17476e..6a5b10f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,11 +4,14 @@ sh() {
   /bin/sh -c "set -x; $*"
 }
 
-sh libtoolize --copy --force --automake
-sh aclocal
-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