Bug 1257104 - Move --enable-eme to moz.configure. r=ted

build/moz.configure/old.configure

@@ -196,7 +196,6 @@ def old_configure_options(*options):
     '--enable-dtrace',
     '--enable-dump-painting',
     '--enable-elf-hack',
-    '--enable-eme',
     '--enable-extensions',
     '--enable-faststripe',
     '--enable-feeds',

old-configure.in

@@ -4355,36 +4355,6 @@ if test x"$MOZ_WIDGET_TOOLKIT" = x"gonk" -a -n "$MOZ_FMP4" -a -n "$ANDROID_VERSI
 fi
 
 
-dnl ========================================================
-dnl = EME support
-dnl ========================================================
-
-MOZ_ARG_ENABLE_STRING(eme,
-[  --enable-eme[=adobe]  Enable support for Encrypted Media Extensions  ],
-    MOZ_EME_ARGS=$enableval)
-
-if test "$MOZ_EME_ARGS"; then
-    if test "$MOZ_EME_ARGS" = "no"; then
-        dnl EME explicitly disabled with --disable-eme
-        MOZ_EME=
-    elif test "$MOZ_EME_ARGS" = "yes"; then
-        dnl EME explicitly enabled with --enable-eme
-        MOZ_EME=1
-    else
-        dnl EME explicitly enabled with --enable-eme=<args>
-        MOZ_EME=1
-        MOZ_EME_MODULES=`echo $MOZ_EME_ARGS | sed -e 's/,/ /g'`
-    fi
-fi
-
-AC_SUBST_SET(MOZ_EME_MODULES)
-if test -n "$MOZ_EME"; then
-    if test -z "$MOZ_FMP4"; then
-        AC_MSG_ERROR([Encrypted Media Extension support requires Fragmented MP4 support])
-    fi
-    AC_DEFINE(MOZ_EME)
-fi
-
 dnl ========================================================
 dnl = Enable media plugin support
 dnl ========================================================
@@ -7937,7 +7907,6 @@ AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_FFVPX)
 AC_SUBST_LIST(FFVPX_ASFLAGS)
-AC_SUBST(MOZ_EME)
 AC_SUBST(MOZ_DIRECTSHOW)
 AC_SUBST(MOZ_ANDROID_OMX)
 AC_SUBST(MOZ_OMX_PLUGIN)

toolkit/moz.configure

@@ -214,3 +214,27 @@ def fmp4(value, target, wmf, applemedia):
         set_define('MOZ_FMP4', '1')
         add_old_configure_assignment('MOZ_FMP4', '1')
     return enabled
+
+
+# EME Support
+# ==============================================================
+option('--enable-eme', nargs='*', choices=('adobe',),
+       help='Enable support for Encrypted Media Extensions')
+
+@depends('--enable-eme', fmp4)
+def eme(value, fmp4):
+    enabled = bool(value)
+    if value.origin == 'default':
+        enabled = enabled or fmp4
+    if enabled and not fmp4:
+        error('Encrypted Media Extension support requires '
+              'Fragmented MP4 support')
+    if enabled:
+        set_config('MOZ_EME', '1')
+        set_define('MOZ_EME', '1')
+    # Theoretically, we could pass `value` directly when it is a
+    # PositiveOptionValue, but somehow, the JSON serialization in configure.py
+    # outputs inconsistent data in some cases when we do (a closing bracket
+    # without an opening one).
+    set_config('MOZ_EME_MODULES', list(value) if value else [])
+    return enabled