Make pkg-config system more flexible
Changes