Improve use of pkg-config