Browse Source

Rename GYP variable node_use_system_openssl to be consistent

v0.9.1-release
Ryan Dahl 13 years ago
committed by Bert Belder
parent
commit
fe464a2fea
  1. 4
      configure
  2. 2
      doc/api/process.markdown
  3. 4
      node.gyp

4
configure

@ -340,7 +340,7 @@ def configure_openssl(o):
o['defines'] += ['OPENSSL_NO_SSL2=1'] o['defines'] += ['OPENSSL_NO_SSL2=1']
if not options.openssl_use_sys: if not options.openssl_use_sys:
o['variables']['node_use_system_openssl'] = b(False) o['variables']['node_shared_openssl'] = b(False)
else: else:
out = pkg_config('openssl') out = pkg_config('openssl')
(libs, cflags) = out if out else ('', '') (libs, cflags) = out if out else ('', '')
@ -355,7 +355,7 @@ def configure_openssl(o):
else: else:
o['cflags'] += cflags.split() o['cflags'] += cflags.split()
o['variables']['node_use_system_openssl'] = b( o['variables']['node_shared_openssl'] = b(
libs or cflags or options.openssl_libpath or options.openssl_includes) libs or cflags or options.openssl_libpath or options.openssl_includes)

2
doc/api/process.markdown

@ -295,7 +295,7 @@ An example of the possible output looks like:
node_shared_zlib: 'false', node_shared_zlib: 'false',
node_use_dtrace: 'false', node_use_dtrace: 'false',
node_use_openssl: 'true', node_use_openssl: 'true',
node_use_system_openssl: 'false', node_shared_openssl: 'false',
strict_aliasing: 'true', strict_aliasing: 'true',
target_arch: 'x64', target_arch: 'x64',
v8_use_snapshot: 'true' } } v8_use_snapshot: 'true' } }

4
node.gyp

@ -9,7 +9,7 @@
'node_shared_v8%': 'false', 'node_shared_v8%': 'false',
'node_shared_zlib%': 'false', 'node_shared_zlib%': 'false',
'node_use_openssl%': 'true', 'node_use_openssl%': 'true',
'node_use_system_openssl%': 'false', 'node_shared_openssl%': 'false',
'library_files': [ 'library_files': [
'src/node.js', 'src/node.js',
'lib/_debugger.js', 'lib/_debugger.js',
@ -136,7 +136,7 @@
'defines': [ 'HAVE_OPENSSL=1' ], 'defines': [ 'HAVE_OPENSSL=1' ],
'sources': [ 'src/node_crypto.cc' ], 'sources': [ 'src/node_crypto.cc' ],
'conditions': [ 'conditions': [
[ 'node_use_system_openssl=="false"', { [ 'node_shared_openssl=="false"', {
'dependencies': [ './deps/openssl/openssl.gyp:openssl' ], 'dependencies': [ './deps/openssl/openssl.gyp:openssl' ],
}]] }]]
}, { }, {

Loading…
Cancel
Save