Merge pull request #88 from Timmmm/patch-1

Add LIBSSH2_SYS_USE_PKG_CONFIG env var

1 files changed, 9 insertions, 4 deletions

diff --git a/libssh2-sys/build.rs b/libssh2-sys/build.rs
index b8509e8..1f5ed1a 100644
--- a/libssh2-sys/build.rs
+++ b/libssh2-sys/build.rs
@@ -18,11 +18,16 @@ fn main() {
     register_dep("Z");
     register_dep("OPENSSL");
 
-    if let Ok(lib) = pkg_config::find_library("libssh2") {
-        for path in &lib.include_paths {
-            println!("cargo:include={}", path.display());
+    // The system copy of libssh2 is not used by default because it
+    // can lead to having two copies of libssl loaded at once.
+    // See https://github.com/alexcrichton/ssh2-rs/pull/88
+    if env::var("LIBSSH2_SYS_USE_PKG_CONFIG").is_ok() {
+        if let Ok(lib) = pkg_config::find_library("libssh2") {
+            for path in &lib.include_paths {
+                println!("cargo:include={}", path.display());
+            }
+            return
         }
-        return
     }
 
     if !Path::new("libssh2/.git").exists() {