diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2011-12-17 03:00:23 +0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2011-12-17 03:00:23 +0400 |
commit | e61de70c96bf3f45a836c2b5b280513f71f165f7 (patch) | |
tree | 0dafd769aca86e21739d454b9867ab7afdf522a7 /configure | |
parent | 64de69c1a4d2befb1be19aaf35028c1c833cdee3 (diff) |
gyp: use built-in openssl by default
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/configure b/configure index d7675089c4d..48b5b9b18e9 100755 --- a/configure +++ b/configure @@ -54,6 +54,11 @@ parser.add_option("--shared-v8-libname", dest="shared_v8_libname", help="Alternative lib name to link to (default: 'v8')") +parser.add_option("--openssl-use-sys", + action="store", + dest="openssl_use_sys", + help="Use the system OpenSSL instead of one included with Node") + parser.add_option("--openssl-includes", action="store", dest="openssl_includes", @@ -201,21 +206,24 @@ def configure_openssl(o): if options.no_ssl2: o['defines'] += ['OPENSSL_NO_SSL2=1'] - out = pkg_config('openssl') - (libs, cflags) = out if out else ('', '') - - if options.openssl_libpath: - o['libraries'] += ['-L%s' % options.openssl_libpath, '-lssl', '-lcrypto'] + if not options.openssl_use_sys: + o['variables']['node_use_system_openssl'] = b(False) else: - o['libraries'] += libs.split() + out = pkg_config('openssl') + (libs, cflags) = out if out else ('', '') - if options.openssl_includes: - o['include_dirs'] += [options.openssl_includes] - else: - o['cflags'] += cflags.split() + if options.openssl_libpath: + o['libraries'] += ['-L%s' % options.openssl_libpath, '-lssl', '-lcrypto'] + else: + o['libraries'] += libs.split() + + if options.openssl_includes: + o['include_dirs'] += [options.openssl_includes] + else: + o['cflags'] += cflags.split() - o['variables']['node_use_system_openssl'] = b( - libs or cflags or options.openssl_libpath or options.openssl_includes) + o['variables']['node_use_system_openssl'] = b( + libs or cflags or options.openssl_libpath or options.openssl_includes) print "configure options:", options |