diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
| commit | e10dfb62ff916d49632febb59565f3c52f4970bd (patch) | |
| tree | e3162c57574bcf7f91d262d9a8cd70ece01f9edb /old-configure.in | |
| parent | fd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 (diff) | |
| parent | 27727874636868dc6d61e8117f81cd761c91e2ed (diff) | |
| download | UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.gz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.lz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.xz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.zip | |
Merge branch 'EME-work'
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/old-configure.in b/old-configure.in index f01f8fcb0..3cb499b93 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3002,6 +3002,35 @@ if test x"$MOZ_WIDGET_TOOLKIT" = x"gonk" -a -n "$MOZ_FMP4" -a -n "$android_versi fi fi +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
+
+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 @@ -5634,7 +5663,8 @@ AC_SUBST(WIN32_GUI_EXE_LDFLAGS) AC_SUBST(MOZ_VORBIS) AC_SUBST(MOZ_TREMOR) AC_SUBST(MOZ_FFVPX) -AC_SUBST_LIST(FFVPX_ASFLAGS) +AC_SUBST_LIST(FFVPX_ASFLAGS)
+AC_SUBST(MOZ_EME) AC_SUBST(MOZ_DIRECTSHOW) AC_SUBST(MOZ_ANDROID_OMX) AC_SUBST(MOZ_OMX_PLUGIN) |