merge the C branch into HEAD

[chaz/openbox] / bootstrap

diff --git a/bootstrap b/bootstrap
index 7d6619e0e4bba68be3e3b6609add9f57a1bb5300..288bd69b528ffe05ff31bb334e1d83ed773e1a70 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4,10 +4,10 @@ sh() {
   /bin/sh -c "set -x; $*"
 }
 
-sh autopoint # for GNU gettext
+sh autopoint --force # for GNU gettext
 sh libtoolize --copy --force --automake
-sh aclocal
-sh autoheader
+sh aclocal -I m4
+#sh autoheader
 sh autoconf
 sh automake --foreign --include-deps --add-missing --copy