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

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)

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