From 4a6f4511c8183ce7df9b347c57304b673638363d Mon Sep 17 00:00:00 2001
From: Dean McNamee <dean@gmail.com>
Date: Tue, 15 Mar 2011 19:48:34 +0000
Subject: [PATCH] Don't override explicit openssl paths with pkg-config
 results.

---
 wscript | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wscript b/wscript
index 33436ec3aaa..b0056670e56 100644
--- a/wscript
+++ b/wscript
@@ -288,9 +288,11 @@ def configure(conf):
        conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
 
   if not Options.options.without_ssl:
-    if conf.check_cfg(package='openssl',
-                      args='--cflags --libs',
-                      uselib_store='OPENSSL'):
+    # Don't override explicitly supplied openssl paths with pkg-config results.
+    explicit_openssl = o.openssl_includes or o.openssl_libpath
+    if not explicit_openssl and conf.check_cfg(package='openssl',
+                                               args='--cflags --libs',
+                                               uselib_store='OPENSSL'):
       Options.options.use_openssl = conf.env["USE_OPENSSL"] = True
       conf.env.append_value("CPPFLAGS", "-DHAVE_OPENSSL=1")
     else: