Bug 657715 - Unbreak build for FreeBSD (since it doesn't have libossaudio). r=kinetik
authorMarco Perez <bugmail@millibyte.net>
Thu, 19 May 2011 09:12:25 +1200
changeset 69676 666ae6b488a75cf6506a455ef1269ccfada3de25
parent 69675 4567d5e86898e19921e508bd85e7b52eea8a48ba
child 69677 4b8d96e463fdf125ce17423cddaadf7ceea45172
push idunknown
push userunknown
push dateunknown
reviewerskinetik
bugs657715
milestone6.0a1
Bug 657715 - Unbreak build for FreeBSD (since it doesn't have libossaudio). r=kinetik
layout/build/Makefile.in
toolkit/library/Makefile.in
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -277,17 +277,17 @@ OS_LIBS += -framework OpenGL
 endif
 
 # Add explicit X11 dependency when building against X11 toolkits
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
 endif
 
 ifdef MOZ_SYDNEYAUDIO
-ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
 EXTRA_DSO_LDOPTS += -lossaudio
 endif
 
 ifeq ($(OS_ARCH),Linux)
 EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
 endif
 ifeq ($(OS_ARCH),Darwin)
 OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -framework IOKit
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -172,17 +172,17 @@ EXTRA_DSO_LDOPTS += \
 	-framework Carbon \
 	-framework CoreAudio \
 	-framework AudioToolbox \
 	-framework AudioUnit \
 	$(NULL)
 endif
 endif
 
-ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
 ifdef MOZ_SYDNEYAUDIO
 EXTRA_DSO_LDOPTS += -lossaudio
 endif
 endif
 
 ifdef MOZ_PLATFORM_MAEMO
 EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 endif