diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-03-04 10:25:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-04 10:25:09 +0100 |
| commit | d739fdc17c6054b4f8cea962714fb1b770289e8f (patch) | |
| tree | 36ba918e8a8e87629d238f72e4b027a9cf4beee8 | |
| parent | 2998d0f5e2d4b35d2db338a71cab0ced27545cdf (diff) | |
| parent | c5e46d92a25ed33e222b945ebbb971439d5dc7f4 (diff) | |
| download | UXP-d739fdc17c6054b4f8cea962714fb1b770289e8f.tar UXP-d739fdc17c6054b4f8cea962714fb1b770289e8f.tar.gz UXP-d739fdc17c6054b4f8cea962714fb1b770289e8f.tar.lz UXP-d739fdc17c6054b4f8cea962714fb1b770289e8f.tar.xz UXP-d739fdc17c6054b4f8cea962714fb1b770289e8f.zip | |
Merge pull request #41 from trav90/master
Fix line endings on old-configure
| -rw-r--r-- | old-configure.in | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/old-configure.in b/old-configure.in index a67e65ce7..70ebf0c19 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3013,34 +3013,34 @@ 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)
+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 ======================================================== @@ -5674,7 +5674,7 @@ 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) |