Merge pull request #657 from jcarpent/topic/pkg-config

Merge pull request #657 from jcarpent/topic/pkg-config #1084