From 832d84d2c05ba765c0e0c1a77cedac28be703153 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 6 Feb 2020 13:05:07 -0500
Subject: Issue #1392 - Change --enable-eme to MOZ_ARG_ENABLE_BOOL and remove
 MOZ_EME_MODULES

---
 old-configure.in | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/old-configure.in b/old-configure.in
index a7b0ce6b9..30b020030 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2892,25 +2892,12 @@ dnl ========================================================
 dnl = EME support
 dnl ========================================================
 
-MOZ_ARG_ENABLE_STRING(eme,
-[  --enable-eme[=widevine]  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
+MOZ_ARG_ENABLE_BOOL(eme,
+[  --enable-eme           Enable support for Encrypted Media Extensions  ],
+    MOZ_EME=1,
+    MOZ_EME=)
+
 
-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])
@@ -2918,6 +2905,8 @@ if test -n "$MOZ_EME"; then
     AC_DEFINE(MOZ_EME)
 fi
 
+AC_SUBST(MOZ_EME)
+
 MOZ_LIBVPX_CFLAGS=
 MOZ_LIBVPX_LIBS=
 
@@ -5208,7 +5197,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_VPX_ERROR_CONCEALMENT)
 AC_SUBST(VPX_USE_YASM)
 AC_SUBST_LIST(VPX_ASFLAGS)
-- 
cgit v1.2.3