[SVN-Commit] r851 - branches/experimental/www/firefox-nightly/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sun Jul  8 12:45:24 2012
New Revision: 851

Log:
fix --disable-alsa on linux

Modified:
   branches/experimental/www/firefox-nightly/files/patch-alsapulse

Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-alsapulse	Fri Jul  6 16:40:08 2012	(r850)
+++ branches/experimental/www/firefox-nightly/files/patch-alsapulse	Sun Jul  8 12:45:24 2012	(r851)
@@ -33,17 +33,18 @@
 index 5980b76..11f5f77 100644
 --- configure.in
 +++ configure.in
-@@ -5632,13 +5632,45 @@ dnl ========================================================
+@@ -5600,13 +5600,45 @@ dnl ========================================================
  dnl = Check alsa availability on Linux if using sydneyaudio
  dnl ========================================================
  
 +MOZ_ARG_ENABLE_BOOL(alsa,
 +[  --enable-alsa          Enable Alsa support],
 +MOZ_ALSA=1,
-+MOZ_ALSA=)
++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
 +
  dnl If using sydneyaudio with Linux, ensure that the alsa library is available
- if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
+-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then
 +    MOZ_ALSA=1
 +fi
 +