Merge Automake changes.