Bug 1255312 - Force --enable-application/--enable-project=js when calling js subconfigure draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 10 Mar 2016 15:48:38 +0900
changeset 338940 e7a363b96695003a3d1d43fc373907c627908a1b
parent 338939 bbef29c632985e5aacf6cde4952c65ae1054a43d
child 338967 17a5da97a2603c599204d1cc254d84b2f865c8c5
push id12613
push userbmo:mh+mozilla@glandium.org
push dateThu, 10 Mar 2016 06:50:18 +0000
bugs1255312
milestone48.0a1
Bug 1255312 - Force --enable-application/--enable-project=js when calling js subconfigure
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -9012,16 +9012,20 @@ RC=
 # Run the SpiderMonkey 'configure' script.
 dist=$MOZ_BUILD_ROOT/dist
 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 
 # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
 # and $NSPR_LIBS.
 ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`"
 
+# Force the subconfigure to use the js project/application regardless of any
+# --enable-application/--enable-project passed to this configure.
+ac_configure_args="$ac_configure_args --enable-application=js --enable-project=js"
+
 if test "$_INTL_API" = no; then
     ac_configure_args="$ac_configure_args --without-intl-api"
 fi
 
 if test "$BUILD_CTYPES"; then
     # Build js-ctypes on the platforms we can.
     ac_configure_args="$ac_configure_args --enable-ctypes"
 fi