Revision bfd78b69

View differences:

configure
131 131
    dest="shared_zlib_libname",
132 132
    help="Alternative lib name to link to (default: 'z')")
133 133

  
134
parser.add_option("--shared-http-parser",
135
    action="store_true",
136
    dest="shared_http_parser",
137
    help="Link to a shared http_parser DLL instead of static linking")
138

  
139
parser.add_option("--shared-http-parser-includes",
140
    action="store",
141
    dest="shared_http_parser_includes",
142
    help="Directory containing http_parser header files")
143

  
144
parser.add_option("--shared-http-parser-libpath",
145
    action="store",
146
    dest="shared_http_parser_libpath",
147
    help="A directory to search for the shared http_parser DLL")
148

  
149
parser.add_option("--shared-http-parser-libname",
150
    action="store",
151
    dest="shared_http_parser_libname",
152
    help="Alternative lib name to link to (default: 'http_parser')")
153

  
134 154
parser.add_option("--with-dtrace",
135 155
    action="store_true",
136 156
    dest="with_dtrace",
......
422 442
    o['include_dirs'] += [options.shared_zlib_includes]
423 443

  
424 444

  
445
def configure_http_parser(o):
446
    o['variables']['node_shared_http_parser'] = b(options.shared_http_parser)
447

  
448
    # assume shared http_parser if one of these is set?
449
    if options.shared_http_parser_libpath:
450
        o['libraries'] += ['-L%s' % options.shared_http_parser_libpath]
451
    if options.shared_http_parser_libname:
452
        o['libraries'] += ['-l%s' % options.shared_http_parser_libname]
453
    elif options.shared_http_parser:
454
        o['libraries'] += ['-lhttp_parser']
455
    if options.shared_http_parser_includes:
456
        o['include_dirs'] += [options.shared_http_parser_includes]
457

  
458

  
425 459
def configure_v8(o):
426 460
  o['variables']['v8_use_snapshot'] = b(not options.without_snapshot)
427 461
  o['variables']['node_shared_v8'] = b(options.shared_v8)
......
475 509

  
476 510
configure_node(output)
477 511
configure_libz(output)
512
configure_http_parser(output)
478 513
configure_v8(output)
479 514
configure_openssl(output)
480 515

  
doc/api/process.markdown
299 299
       { host_arch: 'x64',
300 300
         node_install_npm: 'true',
301 301
         node_prefix: '',
302
         node_shared_http_parser: 'false',
302 303
         node_shared_v8: 'false',
303 304
         node_shared_zlib: 'false',
304 305
         node_use_dtrace: 'false',
node.gyp
8 8
    'node_use_etw%': 'false',
9 9
    'node_shared_v8%': 'false',
10 10
    'node_shared_zlib%': 'false',
11
    'node_shared_http_parser%': 'false',
11 12
    'node_use_openssl%': 'true',
12 13
    'node_use_systemtap%': 'false',
13 14
    'node_shared_openssl%': 'false',
......
59 60

  
60 61
      'dependencies': [
61 62
        'deps/cares/cares.gyp:cares',
62
        'deps/http_parser/http_parser.gyp:http_parser',
63 63
        'deps/uv/uv.gyp:libuv',
64 64
        'node_js2c#host',
65 65
      ],
......
201 201
          'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
202 202
        }],
203 203

  
204
        [ 'node_shared_http_parser=="false"', {
205
          'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
206
        }],
207

  
204 208
        [ 'OS=="win"', {
205 209
          'sources': [
206 210
            'src/res/node.rc',

Also available in: Unified diff