From 11cb060136325f6203a5660f75b8515d27370bc3 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Tue, 16 Dec 2014 20:56:09 -0500
Subject: [PATCH] Bug 1111033 - Disable EME if FMP4 is disabled, r=glandium

---
 configure.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index f30424cc5ca9..55c85f867712 100644
--- a/configure.in
+++ b/configure.in
@@ -3856,7 +3856,6 @@ if test -n "$MOZ_FMP4"; then
 else
   MOZ_FMP4=
 fi
-MOZ_EME=1
 MOZ_FFMPEG=
 MOZ_WEBRTC=1
 MOZ_PEERCONNECTION=
@@ -5327,6 +5326,7 @@ MOZ_ARG_DISABLE_BOOL(fmp4,
 
 if test -n "$MOZ_FMP4"; then
     AC_DEFINE(MOZ_FMP4)
+    MOZ_EME=1
 fi;
 
 dnl ========================================================
@@ -5339,6 +5339,9 @@ MOZ_ARG_DISABLE_BOOL(eme,
     MOZ_EME=1)
 
 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;