From ab123bcba33468b9059a917aa7583d9cf4984a03 Mon Sep 17 00:00:00 2001 From: Chris Pearce Date: Thu, 17 Jun 2010 10:17:36 +1200 Subject: [PATCH] Bug 572001 - Fix configure option --disable-ogg. r=ted --- layout/build/Makefile.in | 2 +- toolkit/toolkit-makefiles.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index d9477b9e334..10909497919 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -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) diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index bda9520afc5..801b713f470 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -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