More fixes for pkg-config.