1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gyp: use built-in openssl by default

Browse Source
This commit is contained in:
Ryan Dahl 2011-12-16 15:00:23 -08:00
parent 64de69c1a4
commit e61de70c96
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -54,6 +54,11 @@ parser.add_option("--shared-v8-libname",
dest="shared_v8_libname", dest="shared_v8_libname",
help="Alternative lib name to link to (default: 'v8')") 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", parser.add_option("--openssl-includes",
action="store", action="store",
dest="openssl_includes", dest="openssl_includes",
@ -201,21 +206,24 @@ def configure_openssl(o):
if options.no_ssl2: if options.no_ssl2:
o['defines'] += ['OPENSSL_NO_SSL2=1'] o['defines'] += ['OPENSSL_NO_SSL2=1']
out = pkg_config('openssl') if not options.openssl_use_sys:
(libs, cflags) = out if out else ('', '') o['variables']['node_use_system_openssl'] = b(False)
if options.openssl_libpath:
o['libraries'] += ['-L%s' % options.openssl_libpath, '-lssl', '-lcrypto']
else: else:
o['libraries'] += libs.split() out = pkg_config('openssl')
(libs, cflags) = out if out else ('', '')
if options.openssl_includes: if options.openssl_libpath:
o['include_dirs'] += [options.openssl_includes] o['libraries'] += ['-L%s' % options.openssl_libpath, '-lssl', '-lcrypto']
else: else:
o['cflags'] += cflags.split() o['libraries'] += libs.split()
o['variables']['node_use_system_openssl'] = b( if options.openssl_includes:
libs or cflags or options.openssl_libpath or 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)
print "configure options:", options print "configure options:", options