Bug 1257104 - Move --disable-wmf to moz.configure. r=ted

build/moz.configure/old.configure

@@ -298,7 +298,6 @@ def old_configure_options(*options):
     '--enable-websms-backend',
     '--enable-webspeech',
     '--enable-webspeechtestbackend',
-    '--enable-wmf',
     '--enable-xul',
     '--enable-zipwriter',
     '--no-create',

old-configure.in

@@ -3066,7 +3066,6 @@ MOZ_TREMOR=
 MOZ_SAMPLE_TYPE_FLOAT32=
 MOZ_SAMPLE_TYPE_S16=
 MOZ_DIRECTSHOW=
-MOZ_WMF=
 if test -n "$MOZ_FMP4"; then
   MOZ_FMP4=1
 else
@@ -4353,25 +4352,6 @@ if test -n "$MOZ_DIRECTSHOW"; then
     AC_DEFINE(MOZ_DIRECTSHOW)
 fi;
 
-dnl ========================================================
-dnl = Windows Media Foundation support
-dnl ========================================================
-if test "$OS_ARCH" = "WINNT"; then
-    dnl Enable Windows Media Foundation support by default.
-    dnl Note our minimum SDK version is Windows 7 SDK, so we are (currently)
-    dnl guaranteed to have a recent-enough SDK to build WMF.
-    MOZ_WMF=1
-fi
-
-MOZ_ARG_DISABLE_BOOL(wmf,
-[  --disable-wmf  Disable support for Windows Media Foundation],
-    MOZ_WMF=,
-    MOZ_WMF=1)
-
-if test -n "$MOZ_WMF"; then
-    AC_DEFINE(MOZ_WMF)
-fi;
-
 dnl ========================================================
 dnl FFmpeg H264/AAC Decoding Support
 dnl ========================================================
@@ -8011,7 +7991,6 @@ AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 
 AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
-AC_SUBST(MOZ_WMF)
 AC_SUBST(MOZ_FFMPEG)
 AC_SUBST(MOZ_FFVPX)
 AC_SUBST_LIST(FFVPX_ASFLAGS)

toolkit/moz.configure

@@ -157,3 +157,26 @@ def applemedia(toolkit):
         add_old_configure_assignment('MOZ_APPLEMEDIA', '1')
         return True
     return False
+
+
+# Windows Media Foundation support
+# ==============================================================
+option('--disable-wmf',
+       help='Disable support for Windows Media Foundation')
+
+@depends('--disable-wmf', target)
+def wmf(value, target):
+    enabled = bool(value)
+    if value.origin == 'default':
+        # Enable Windows Media Foundation support by default.
+        # Note our minimum SDK version is Windows 7 SDK, so we are (currently)
+        # guaranteed to have a recent-enough SDK to build WMF.
+        enabled = target.os == 'WINNT'
+    if enabled and target.os != 'WINNT':
+        error('Cannot enable Windows Media Foundation support on %s'
+              % target.os)
+    if enabled:
+        set_config('MOZ_WMF', '1')
+        set_define('MOZ_WMF', '1')
+        add_old_configure_assignment('MOZ_WMF', '1')
+    return enabled