[vlc-commits] ALSA: require alsa-lib on Linux by default if PulseAudio is missing

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May  1 16:35:54 2011 +0300| [7e95f9a76fa3081088fff70e9c8ae2013c8d24ba] | committer: Rémi Denis-Courmont

ALSA: require alsa-lib on Linux by default if PulseAudio is missing

This ensures that at least either ALSA or PulseAudio will be compiled
by default (on Linux).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7e95f9a76fa3081088fff70e9c8ae2013c8d24ba
---

 configure.ac |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a910f1d..7b4ec91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3498,14 +3498,19 @@ dnl
 dnl  ALSA module
 dnl
 AC_ARG_ENABLE(alsa,
-  [  --enable-alsa           Advanced Linux Sound Architecture (default auto)])
+  [AS_HELP_STRING([--enable-alsa],
+    [support the Advanced Linux Sound Architecture (default auto)])],, [
+  AS_IF([test "$SYS" = "linux" -a "${have_pulse}" = "no"], [
+    enable_alsa="yes"
+  ])
+])
 have_alsa="no"
 AS_IF([test "${enable_alsa}" != "no"], [
   PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [
     have_alsa="yes"
   ], [
     AS_IF([test "x${enable_alsa}" != "x"], [
-      AC_MSG_ERROR([alsa-lib version 1.0.16 or later not found])
+      AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.16 or later required.])
     ])
   ])
 ])