contribs: goom2k4

[vlc] / extras / contrib / src / contrib-src.mak

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 9627a0fe0f9825086f3f213a44e37e1c9dc7aea3..521f7938ad6f032ebbcd3df80d22ffbd3643126a 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -89,7 +89,7 @@ else
 HOSTCC2=$(HOSTCC)
 endif
 
-FFMPEGCONF=
+FFMPEGCONF=--disable-doc
 
 # cross compiling
 #This should be inside the if block but some config scripts are buggy
@@ -1346,7 +1346,7 @@ else
 endif
        patch -p0 < Patches/goom2k4-0-memleaks.patch
        patch -p0 < Patches/goom2k4-autotools.patch
-       (cd $@; rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf)
+       (cd $@; rm -f configure; autoreconf -ivf)
 
 .goom2k4: goom
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
@@ -2172,9 +2172,6 @@ expat: expat-$(EXPAT_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .expat: expat
-ifdef HAVE_DARWIN_OS
-       (cd $< aclocal --force && libtoolize --force && autoconf --force && autoheader --force )
-endif
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
        touch $@