daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't override explicit openssl paths with pkg-config results.

pull/22966/head
Dean McNamee 2011-03-15 19:48:34 +00:00 committed by Ryan Dahl
parent 66570c1964
commit 4a6f4511c8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wscript
View File

@ -288,7 +288,9 @@ def configure(conf):
conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.") conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
if not Options.options.without_ssl: if not Options.options.without_ssl:
if conf.check_cfg(package='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', args='--cflags --libs',
uselib_store='OPENSSL'): uselib_store='OPENSSL'):
Options.options.use_openssl = conf.env["USE_OPENSSL"] = True Options.options.use_openssl = conf.env["USE_OPENSSL"] = True