0a8e5e996f
This fix was only needed for breakage caused by pkgconf, which has
meanwhile been fixed.
This reverts commit 71f0f861ce.