Bug 572001 - Fix configure option --disable-ogg. r=ted

This commit is contained in:
Chris Pearce 2010-06-17 10:17:36 +12:00
parent 2f4e9481da
commit ab123bcba3
2 changed files with 2 additions and 2 deletions

View File

@ -114,6 +114,7 @@ SHARED_LIBRARY_LIBS = \
ifdef MOZ_VORBIS
SHARED_LIBRARY_LIBS += \
$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
$(NULL)
endif
@ -125,7 +126,6 @@ endif
ifdef MOZ_OGG
SHARED_LIBRARY_LIBS += \
$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
$(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
$(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \
$(NULL)

View File

@ -1207,13 +1207,13 @@ fi
if [ "$MOZ_VORBIS" ]; then
add_makefiles "
$MAKEFILES_libvorbis
$MAKEFILES_libogg
"
fi
if [ "$MOZ_OGG" ]; then
add_makefiles "
$MAKEFILES_libtheora
$MAKEFILES_libogg
content/media/ogg/Makefile
"
fi