Revert "Remove pkg-config related hack instead depend on pkg-config (>= 0.23)"