Revision fe464a2f

View differences:

configure
340 340
    o['defines'] += ['OPENSSL_NO_SSL2=1']
341 341

  
342 342
  if not options.openssl_use_sys:
343
    o['variables']['node_use_system_openssl'] = b(False)
343
    o['variables']['node_shared_openssl'] = b(False)
344 344
  else:
345 345
    out = pkg_config('openssl')
346 346
    (libs, cflags) = out if out else ('', '')
......
355 355
    else:
356 356
      o['cflags'] += cflags.split()
357 357

  
358
    o['variables']['node_use_system_openssl'] = b(
358
    o['variables']['node_shared_openssl'] = b(
359 359
      libs or cflags or options.openssl_libpath or options.openssl_includes)
360 360

  
361 361

  
doc/api/process.markdown
295 295
         node_shared_zlib: 'false',
296 296
         node_use_dtrace: 'false',
297 297
         node_use_openssl: 'true',
298
         node_use_system_openssl: 'false',
298
         node_shared_openssl: 'false',
299 299
         strict_aliasing: 'true',
300 300
         target_arch: 'x64',
301 301
         v8_use_snapshot: 'true' } }
node.gyp
9 9
    'node_shared_v8%': 'false',
10 10
    'node_shared_zlib%': 'false',
11 11
    'node_use_openssl%': 'true',
12
    'node_use_system_openssl%': 'false',
12
    'node_shared_openssl%': 'false',
13 13
    'library_files': [
14 14
      'src/node.js',
15 15
      'lib/_debugger.js',
......
136 136
          'defines': [ 'HAVE_OPENSSL=1' ],
137 137
          'sources': [ 'src/node_crypto.cc' ],
138 138
          'conditions': [
139
            [ 'node_use_system_openssl=="false"', {
139
            [ 'node_shared_openssl=="false"', {
140 140
              'dependencies': [ './deps/openssl/openssl.gyp:openssl' ],
141 141
            }]]
142 142
        }, {

Also available in: Unified diff