* disable ASM support in libtheora for now (until the authors release a fixed version...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ca6e06c577c4333a5be09acc5dac19cf05c0b4ed..b2230dc8e09e6d4d33b909913a797e39bcf91d68 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -771,8 +771,11 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifdef HAVE_BEOS
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
 else
+  ifdef HAVE_DARWIN_9
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm --disable-sdltest --disable-oggtest --disable-vorbistest --disable-asm --disable-examples && make && make install)
+  else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples && make && make install)
-
+  endif
 endif
        $(INSTALL_NAME)
        touch $@