Fix some aclocal warnings during autogen.sh