зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1452509 - Move --enable-alsa to moz.configure. r=froydnj
MozReview-Commit-ID: Cv0HnZPvkWe --HG-- extra : rebase_source : 1108a3d58e14bef335334e160186dca8a0bfcaee
This commit is contained in:
Родитель
4c4327e871
Коммит
efa1be2618
|
@ -170,7 +170,6 @@ def old_configure_options(*options):
|
|||
'--cache-file',
|
||||
'--datadir',
|
||||
'--enable-accessibility',
|
||||
'--enable-alsa',
|
||||
'--enable-bundled-fonts',
|
||||
'--enable-content-sandbox',
|
||||
'--enable-cookies',
|
||||
|
|
|
@ -2599,24 +2599,6 @@ MOZ_WEBM_ENCODER=1
|
|||
AC_DEFINE(MOZ_WEBM_ENCODER)
|
||||
AC_SUBST(MOZ_WEBM_ENCODER)
|
||||
|
||||
dnl ==================================
|
||||
dnl = Check alsa availability on Linux
|
||||
dnl ==================================
|
||||
|
||||
MOZ_ARG_ENABLE_BOOL(alsa,
|
||||
[ --enable-alsa Enable Alsa support],
|
||||
MOZ_ALSA=1,
|
||||
MOZ_ALSA=)
|
||||
|
||||
if test -n "$MOZ_ALSA"; then
|
||||
AC_DEFINE(MOZ_ALSA)
|
||||
PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
|
||||
[echo "$MOZ_ALSA_PKG_ERRORS"
|
||||
AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_ALSA)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Disable PulseAudio
|
||||
dnl ========================================================
|
||||
|
|
|
@ -55,6 +55,16 @@ imply_option('--enable-profiling', dmd)
|
|||
imply_option('--enable-jemalloc', dmd)
|
||||
imply_option('--enable-replace-malloc', dmd)
|
||||
|
||||
# ALSA cubeb backend
|
||||
# ==============================================================
|
||||
option('--enable-alsa', env='MOZ_ALSA',
|
||||
help='Enable ALSA audio backend.')
|
||||
|
||||
alsa = pkg_check_modules('MOZ_ALSA', 'alsa', when='--enable-alsa')
|
||||
|
||||
set_config('MOZ_ALSA', depends_if(alsa)(lambda _: True))
|
||||
set_define('MOZ_ALSA', depends_if(alsa)(lambda _: True))
|
||||
|
||||
# JACK cubeb backend
|
||||
# ==============================================================
|
||||
option('--enable-jack', env='MOZ_JACK',
|
||||
|
|
Загрузка…
Ссылка в новой задаче