summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-09-02 20:47:31 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-02-22 11:12:45 +0100
commitb7274fd666e1bb33effc1425701f566bcaa6f7be (patch)
tree8d47e9c647b722907b29f0a0eaa25184a6f78287
parenteaac0616072e22313ea96eb6e68d9a8f28f70dc7 (diff)
downloadUXP-b7274fd666e1bb33effc1425701f566bcaa6f7be.tar
UXP-b7274fd666e1bb33effc1425701f566bcaa6f7be.tar.gz
UXP-b7274fd666e1bb33effc1425701f566bcaa6f7be.tar.lz
UXP-b7274fd666e1bb33effc1425701f566bcaa6f7be.tar.xz
UXP-b7274fd666e1bb33effc1425701f566bcaa6f7be.zip
Enable ALSA support by default on Linux.
This will enable PulseAudio by default with a run-time fallback to ALSA (like Firefox <52). This resolves #115. PulseAudio will remain enabled by default -- if at runtime it's not available, it will fall back to ALSA. Building the tree will still require libpulse to be installed, unless using --disable-pulseaudio.
-rw-r--r--old-configure.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/old-configure.in b/old-configure.in
index 4fbe49b96..afa6e3069 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -3210,15 +3210,20 @@ dnl ==================================
dnl = Check alsa availability on Linux
dnl ==================================
+dnl If using Linux, enable the alsa library by default
+if test "$OS_TARGET" = "Linux"; then
+ MOZ_ALSA=1
+fi
+
MOZ_ARG_ENABLE_BOOL(alsa,
-[ --enable-alsa Enable Alsa support],
+[ --enable-alsa Enable Alsa support (default on Linux)],
MOZ_ALSA=1,
MOZ_ALSA=)
if test -n "$MOZ_ALSA"; then
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.)])])
+ AC_MSG_ERROR([You need ALSA for audio output on Linux.])])
fi
AC_SUBST(MOZ_ALSA)
@@ -3246,7 +3251,7 @@ if test -n "$MOZ_PULSEAUDIO"; then
if test -z "$gonkdir"; then
PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
[echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
- AC_MSG_ERROR([pulseaudio audio backend requires libpulse development package])])
+ AC_MSG_ERROR([Building pulseaudio audio backend requires libpulse development package])])
else
MOZ_PULSEAUDIO_CFLAGS="-I$gonkdir/external/pulseaudio/pulseaudio/src"
fi