- Bump automake to 1.7.

bootstrap

@@ -1,8 +1,6 @@
 #!/bin/sh
 # bootstrap the build when checking out from CVS
 
-export WANT_AUTOMAKE_1_6=1
-
 if [ "$1" = "clean" ]; then
     # quick hack to remove extra generated files that make distclean
     # doesn't remove
@@ -20,8 +18,8 @@ fi
 
 # no version checking is done here, it's too hard and not worth the effort
 # when one can just read the README
-aclocal-1.6 && \
+aclocal-1.7 && \
 autoheader && \
 libtoolize --copy --automake && \
-automake-1.6 --foreign --add-missing --copy && \
+automake-1.7 --foreign --add-missing --copy && \
 autoconf