Bug 1295480 - Move --disable-webspeech to python configure. r=chmanch…

…ester
iaxat · Aug 17, 2016 · 9e63cdc · 9e63cdc
1 parent ade7edd
commit 9e63cdc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
@@ -23,7 +23,6 @@ MOZ_NO_SMART_CARDS=1
 MOZ_APP_STATIC_INI=1
 MOZ_NO_EV_CERTS=1
 
-MOZ_WEBSPEECH=1
 if test -n "$NIGHTLY_BUILD"; then
 MOZ_WEBSPEECH_MODELS=1
 fi

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
@@ -247,7 +247,6 @@ def old_configure_options(*options):
     '--enable-valgrind',
     '--enable-verify-mar',
     '--enable-webrtc',
-    '--enable-webspeech',
     '--enable-webspeechtestbackend',
     '--enable-xul',
     '--enable-zipwriter',

diff --git a/old-configure.in b/old-configure.in
@@ -2334,7 +2334,6 @@ MOZ_SCTP=
 MOZ_ANDROID_OMX=
 MOZ_OMX_PLUGIN=
 MOZ_VPX_ERROR_CONCEALMENT=
-MOZ_WEBSPEECH=1
 MOZ_WEBSPEECH_MODELS=
 MOZ_WEBSPEECH_TEST_BACKEND=1
 VPX_USE_YASM=
@@ -3006,20 +3005,6 @@ else
     AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
 fi
 
-dnl ========================================================
-dnl = Disable Speech API code
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(webspeech,
-[  --disable-webspeech        Disable support for HTML Speech API],
-    MOZ_WEBSPEECH=,
-    MOZ_WEBSPEECH=1)
-
-if test -n "$MOZ_WEBSPEECH"; then
-    AC_DEFINE(MOZ_WEBSPEECH)
-fi
-
-AC_SUBST(MOZ_WEBSPEECH)
-
 dnl ========================================================
 dnl = Disable Speech API test backend
 dnl ========================================================

diff --git a/toolkit/moz.configure b/toolkit/moz.configure
@@ -541,11 +541,24 @@ option('--disable-synth-speechd', help='Disable speech-dispatcher support')
 set_config('MOZ_SYNTH_SPEECHD',
            depends_if('--disable-synth-speechd')(lambda _: True))
 
+# Speech API
+# ==============================================================
+option('--disable-webspeech', help='Disable support for HTML Speech API')
+
+@depends('--disable-webspeech')
+def webspeech(value):
+    if value:
+        return True
+
+set_config('MOZ_WEBSPEECH', webspeech)
+set_define('MOZ_WEBSPEECH', webspeech)
+add_old_configure_assignment('MOZ_WEBSPEECH', webspeech)
+
 # Speech API pocketsphinx backend
 # ==============================================================
-@depends(build_project, milestone)
-def webspeech_pocketsphinx(build_project, milestone):
-    if milestone.is_nightly and build_project == 'b2g':
+@depends(build_project, milestone, webspeech)
+def webspeech_pocketsphinx(build_project, milestone, webspeech):
+    if webspeech and milestone.is_nightly and build_project == 'b2g':
         return True
 
 set_config('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)