Merge pull request #21 from SuperHeron/master

Use PKG_CONFIG environment variable

Author: alexcrichton

src/lib.rs

@@ -328,7 +328,8 @@ impl Config {
     }
 
     fn command(&self, name: &str, args: &[&str]) -> Command {
-        let mut cmd = Command::new("pkg-config");
+        let exe = env::var("PKG_CONFIG").unwrap_or(String::from("pkg-config"));
+        let mut cmd = Command::new(exe);
         if self.is_static(name) {
             cmd.arg("--static");
         }

tests/test.rs

@@ -11,8 +11,10 @@ static LOCK: StaticMutex = MUTEX_INIT;
 
 fn reset() {
     for (k, _) in env::vars() {
-        if k.contains("PKG_CONFIG") || k.contains("DYNAMIC") ||
-           k.contains("STATIC") {
+        if k.contains("DYNAMIC") ||
+           k.contains("STATIC") ||
+           k.contains("PKG_CONFIG_ALLOW_CROSS") ||
+           k.contains("FOO_NO_PKG_CONFIG") {
             env::remove_var(&k);
         }
     }