build: --without-ssl implies --without-inspector

This cherry-picks the changes to `configure` from commit 8f00455 ("inspector: switch to new inspector APIs") from the master branch and should unbreak `--without-ssl` builds. Refs: nodejs/node#12155 PR-URL: nodejs/node#12200 Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
michielbaird · Jul 19, 2017 · d39d150 · d39d150
1 parent 5854fa3
commit d39d150
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/configure b/configure
@@ -894,7 +894,6 @@ def configure_node(o):
     o['variables']['library_files'] = options.linked_module
 
   o['variables']['asan'] = int(options.enable_asan or 0)
-  o['variables']['v8_inspector'] = b(not options.without_inspector)
   o['variables']['debug_devtools'] = 'node'
 
   if options.use_xcode and options.use_ninja:
@@ -1268,6 +1267,12 @@ def configure_intl(o):
         pprint.pformat(icu_config, indent=2) + '\n')
   return  # end of configure_intl
 
+def configure_inspector(o):
+  disable_inspector = (options.without_inspector or
+                       options.with_intl in (None, 'none') or
+                       options.without_ssl)
+  o['variables']['v8_inspector'] = b(not disable_inspector)
+
 output = {
   'variables': {},
   'include_dirs': [],
@@ -1298,6 +1303,7 @@ configure_v8(output)
 configure_openssl(output)
 configure_intl(output)
 configure_static(output)
+configure_inspector(output)
 
 # variables should be a root level element,
 # move everything else to target_defaults