Merge pull request #116 from pcc/fix2

Fix autotools build.