Changes for new Automake version.