Merge pull request #2253 from mhei/fix-pkg-config