Bug 747303 - Android/x86 shouldn't check ALSA. r=khuey
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 27 Apr 2012 17:07:40 +0900
changeset 92592 efff3b105a931cb9bba917ad0568000eb1493e9a
parent 92591 bba6161714f2d30fc21a555031f78b96c948993b
child 92593 eb4b76b2840f820f4b9549df4af6abe01fdd110b
push id8763
push userm_kato@ga2.so-net.ne.jp
push dateFri, 27 Apr 2012 08:25:17 +0000
treeherdermozilla-inbound@efff3b105a93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs747303
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 747303 - Android/x86 shouldn't check ALSA. r=khuey
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5830,24 +5830,20 @@ if test -n "$MOZ_TREMOR"; then
     AC_DEFINE(MOZ_TREMOR)
 fi
 
 dnl ========================================================
 dnl = Check alsa availability on Linux if using sydneyaudio
 dnl ========================================================
 
 dnl If using sydneyaudio with Linux, ensure that the alsa library is available
-if test -n "$MOZ_SYDNEYAUDIO"; then
-   case "$target_os" in
-linux*)
-      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
+if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
+    PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
          [echo "$MOZ_ALSA_PKG_ERRORS"
           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
-      ;;
-   esac
 fi
 
 dnl ========================================================
 dnl = Enable GStreamer
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(gstreamer,
 [  --enable-gstreamer           Enable GStreamer support],
 MOZ_GSTREAMER=1,