Revision 38809e39

View differences:

configure
171 171
    dest="shared_cares_libname",
172 172
    help="Alternative lib name to link to (default: 'cares')")
173 173

  
174
parser.add_option("--shared-libuv",
175
    action="store_true",
176
    dest="shared_libuv",
177
    help="Link to a shared libuv DLL instead of static linking")
178

  
179
parser.add_option("--shared-libuv-includes",
180
    action="store",
181
    dest="shared_libuv_includes",
182
    help="Directory containing libuv header files")
183

  
184
parser.add_option("--shared-libuv-libpath",
185
    action="store",
186
    dest="shared_libuv_libpath",
187
    help="A directory to search for the shared libuv DLL")
188

  
189
parser.add_option("--shared-libuv-libname",
190
    action="store",
191
    dest="shared_libuv_libname",
192
    help="Alternative lib name to link to (default: 'uv')")
193

  
174 194
parser.add_option("--with-dtrace",
175 195
    action="store_true",
176 196
    dest="with_dtrace",
......
495 515
        o['include_dirs'] += [options.shared_cares_includes]
496 516

  
497 517

  
518
def configure_libuv(o):
519
  o['variables']['node_shared_libuv'] = b(options.shared_libuv)
520

  
521
  # assume shared libuv if one of these is set?
522
  if options.shared_libuv_libpath:
523
    o['libraries'] += ['-L%s' % options.shared_libuv_libpath]
524
  if options.shared_libuv_libname:
525
    o['libraries'] += ['-l%s' % options.shared_libuv_libname]
526
  elif options.shared_libuv:
527
    o['libraries'] += ['-luv']
528
  if options.shared_libuv_includes:
529
    o['include_dirs'] += [options.shared_libuv_includes]
530

  
531

  
498 532
def configure_v8(o):
499 533
  o['variables']['v8_use_snapshot'] = b(not options.without_snapshot)
500 534
  o['variables']['node_shared_v8'] = b(options.shared_v8)
......
550 584
configure_libz(output)
551 585
configure_http_parser(output)
552 586
configure_cares(output)
587
configure_libuv(output)
553 588
configure_v8(output)
554 589
configure_openssl(output)
555 590

  
doc/api/process.markdown
301 301
         node_prefix: '',
302 302
         node_shared_cares: 'false',
303 303
         node_shared_http_parser: 'false',
304
         node_shared_libuv: 'false',
304 305
         node_shared_v8: 'false',
305 306
         node_shared_zlib: 'false',
306 307
         node_use_dtrace: 'false',
node.gyp
10 10
    'node_shared_zlib%': 'false',
11 11
    'node_shared_http_parser%': 'false',
12 12
    'node_shared_cares%': 'false',
13
    'node_shared_libuv%': 'false',
13 14
    'node_use_openssl%': 'true',
14 15
    'node_use_systemtap%': 'false',
15 16
    'node_shared_openssl%': 'false',
......
60 61
      'type': 'executable',
61 62

  
62 63
      'dependencies': [
63
        'deps/uv/uv.gyp:libuv',
64 64
        'node_js2c#host',
65 65
      ],
66 66

  
......
209 209
          'dependencies': [ 'deps/cares/cares.gyp:cares' ],
210 210
        }],
211 211

  
212
        [ 'node_shared_libuv=="false"', {
213
          'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
214
        }],
215

  
212 216
        [ 'OS=="win"', {
213 217
          'sources': [
214 218
            'src/res/node.rc',

Also available in: Unified diff