Update from upstream Automake files.