Make default autogen simpler,add marker to keep m4 dir