Fix misprint
Invoke pkg-config macros properly
Try to help some builds (on Windows, no less)
Revert "Try to help some builds (on Windows, no less)"

This reverts commit 7c3963fc8e852e7ed7000accb326f5f178196c41.

Previous commit broke my build.  Clearly more work needs to be done in
this area...
Merge branch 'master', remote-tracking branch 'fdo/master'