Make sure $PKG_CONFIG is set before calling PKG_CHECK_MODULES().
Merge remote branch 'origin/4.1-pkg_config_fix' into 4.1-lbnl