contrib: fixed theora compilation within the iOS Simulator

[vlc] / contrib / src / theora / rules.mak

diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index c3b6c1e89922f23bad5fee2bc69b1ca9274392a5..17b80d18c91acac7355e1ebec40d33501c26c254 100644 (file)
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -17,7 +17,7 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
 libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
        $(UNPACK)
        $(APPLY) $(SRC)/theora/libtheora-includes.patch
-       echo 'ACLOCAL_AMFLAGS = -I m4' >> $(UNPACK_DIR)/Makefile.am
+       $(UPDATE_AUTOCONFIG)
        $(MOVE)
 
 THEORACONF := $(HOSTCONF) \
@@ -36,6 +36,9 @@ endif
 ifdef HAVE_MACOSX64
 THEORACONF += --disable-asm
 endif
+ifdef HAVE_IOS
+THEORACONF += --disable-asm
+endif
 ifdef HAVE_WIN64
 THEORACONF += --disable-asm
 endif
@@ -43,9 +46,7 @@ endif
 DEPS_theora = ogg $(DEPS_ogg)
 
 .theora: libtheora
-ifdef HAVE_WIN32
-       $(RECONF)
-endif
+       cd $< && autoreconf -ivf -I m4
        cd $< && $(HOSTVARS) ./configure $(THEORACONF)
        cd $< && $(MAKE) install
        touch $@