Restore automake 1.10 and 1.11 to bootstrap