backport scons changes

This is an attempt to fixup our scons pkg-config code, following
issue raised by homebrew folks