Bug 1257468 - Move JS_STANDALONE to moz.configure. r=nalexander

build/moz.configure/init.configure

@@ -255,6 +255,7 @@ def wanted_mozconfig_variables(help):
          'DSYMUTIL',
          'EXTERNAL_SOURCE_DIR',
          'GENISOIMAGE',
+         'JS_STANDALONE',
          'L10NBASEDIR',
          'MOZILLABUILD',
          'MOZ_ARTIFACT_BUILDS',

js/moz.configure

@@ -8,10 +8,24 @@
 # =========================================================
 
 @depends(build_project, '--help')
-def js_shell_default(build_project, help):
+def building_js(build_project, help):
     return build_project == 'js'
 
-js_option('--disable-js-shell', default=js_shell_default,
+# Exception to the rule above: JS_STANDALONE is a special option that doesn't
+# want the js_option treatment. When we're done merging js/src/configure and
+# top-level configure, it can go away, although the JS_STANDALONE config
+# will still need to be set depending on building_js above.
+option(env='JS_STANDALONE', default=building_js,
+       help='Reserved for internal use')
+
+@depends('JS_STANDALONE')
+def js_standalone(value):
+    if value:
+        set_config('JS_STANDALONE', '1')
+        add_old_configure_assignment('JS_STANDALONE', '1')
+
+
+js_option('--disable-js-shell', default=building_js,
        help='Do not build the JS shell')
 
 @depends('--disable-js-shell')
@@ -22,14 +36,10 @@ def js_shell(value):
 
 # SpiderMonkey as a shared library, and how its symbols are exported
 # ==================================================================
-@depends(build_project, '--help')
-def js_shared_default(build_project, help):
-    return build_project == 'js'
-
-js_option('--disable-shared-js', default=js_shared_default,
+js_option('--disable-shared-js', default=building_js,
           help='Do not create a shared library')
 
-js_option('--disable-export-js', default=js_shared_default,
+js_option('--disable-export-js', default=building_js,
           help='Do not mark JS symbols as DLL exported/visible')
 
 @depends('--disable-shared-js', '--disable-export-js')

js/src/old-configure.in

@@ -75,16 +75,12 @@ MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd -P`
 
 MOZ_DEFAULT_COMPILER
 
-if test "$JS_STANDALONE" = no; then
+if test -z "$JS_STANDALONE"; then
   autoconfmk=autoconf-js.mk
-  JS_STANDALONE=
   #DIST is exported from top-level configure
 else
-  JS_STANDALONE=1
-  AC_DEFINE(JS_STANDALONE)
   DIST="$MOZ_BUILD_ROOT/dist"
 fi
-AC_SUBST(JS_STANDALONE)
 AC_SUBST(autoconfmk)
 
 MOZ_ARG_WITH_STRING(gonk-toolchain-prefix,

old-configure.in

@@ -7939,7 +7939,7 @@ export RUSTC
 export MOZILLA_CENTRAL_PATH=$_topsrcdir
 export STLPORT_CPPFLAGS
 export STLPORT_LIBS
-export JS_STANDALONE=no
+export JS_STANDALONE=
 unset MOZ_BUILD_APP
 export DIST
 export MOZ_LINKER