Merge pull request #2082 from akoeplinger/fix-automake