This reverts commit cf3f8205c4. It was a good initiative, but waf 2.0 introces backward incompatible changes that break the pkg-config checks. The config checks will be updated before migrating to waf 2.0.
cf3f8205c4