Bug 741289 - Sydneyaudio does not include MOZ_ALSA_CFLAGS. r=glandium,romaxa
authorPrabindh Sundareson <prabu@ti.com>
Wed, 11 Apr 2012 07:58:27 -0400
changeset 94733 810e8295b080a8680d8676ffecf78dac584ef76c
parent 94732 83b64bb97f2562b3bdba5fb41511c8bd54f6b43d
child 94734 ce72679ffb95dbccb8baaab799ffbe1447ffa258
push idunknown
push userunknown
push dateunknown
reviewersglandium, romaxa
bugs741289
milestone14.0a1
Bug 741289 - Sydneyaudio does not include MOZ_ALSA_CFLAGS. r=glandium,romaxa
config/autoconf.mk.in
configure.in
media/libsydneyaudio/src/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -582,16 +582,17 @@ MOZ_LIBPROXY_CFLAGS     = @MOZ_LIBPROXY_
 MOZ_LIBPROXY_LIBS       = @MOZ_LIBPROXY_LIBS@
 MOZ_ENABLE_LIBPROXY     = @MOZ_ENABLE_LIBPROXY@
 
 MOZ_LIBNOTIFY_CFLAGS	= @MOZ_LIBNOTIFY_CFLAGS@
 MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS@
 MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
 
 MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
+MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
 
 GLIB_CFLAGS	= @GLIB_CFLAGS@
 GLIB_LIBS	= @GLIB_LIBS@
 GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
 
 MOZ_NATIVE_MAKEDEPEND	= @SYSTEM_MAKEDEPEND@
 
 export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@
--- a/configure.in
+++ b/configure.in
@@ -8642,16 +8642,17 @@ AC_SUBST(MOZ_CUBEB)
 AC_SUBST(MOZ_WAVE)
 AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_WEBM)
 AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT)
 AC_SUBST(MOZ_VP8_ENCODER)
 AC_SUBST(MOZ_OGG)
 AC_SUBST(MOZ_ALSA_LIBS)
+AC_SUBST(MOZ_ALSA_CFLAGS)
 AC_SUBST(VPX_AS)
 AC_SUBST(VPX_ASFLAGS)
 AC_SUBST(VPX_DASH_C_FLAG)
 AC_SUBST(VPX_AS_CONVERSION)
 AC_SUBST(VPX_ASM_SUFFIX)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
 AC_SUBST(VPX_NEED_OBJ_INT_EXTRACT)
--- a/media/libsydneyaudio/src/Makefile.in
+++ b/media/libsydneyaudio/src/Makefile.in
@@ -102,8 +102,10 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += winmm.lib
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../include
+
+CFLAGS += $(MOZ_ALSA_CFLAGS)