contribs: pass our aclocal directory to autoreconf

And use autoreconf instead of autogen for tremor.

diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index 687bce3dd5e1c789888720acc483e73be6d67a35..e8e455c01bcc1154d641faadf578eaf905fc1feb 100644 (file)
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -19,7 +19,7 @@ endif
 
 .a52: a52dec
 ifdef HAVE_WIN64
-       cd $< && autoreconf -fi
+       cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
 endif
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
        cd $</liba52 && $(MAKE) install

diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index e5bea2b1745a450491d5122fcae3848a0442ed52..1c5cba0332bdca04f4dbdaec6540097a6533e8ed 100644 (file)
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -16,7 +16,7 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass
 #TODO .fontconfig
 
 .ass: libass .freetype2
-       #cd $< && autoreconf -fiv
+       #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
        cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) --disable-png --disable-enca
        cd $< && $(MAKE) install
        touch $@

diff --git a/contrib/src/faad2/rules.mak b/contrib/src/faad2/rules.mak
index d3fef5d92ffe931d8108aebefb4d251ee153b32b..1ab2ad8334cef11a7bab099361a21765f71895d9 100644 (file)
--- a/contrib/src/faad2/rules.mak
+++ b/contrib/src/faad2/rules.mak
@@ -22,7 +22,7 @@ endif
        $(MOVE)
 
 .faad2: faad2
-       cd $< && autoreconf -fiv
+       cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="$(NOTHUMB)"
        cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool
        cd $</libfaad && $(MAKE) install

diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 83696e6deef44e14d53171f079b5ed1d608c2875..59141fe056d53a60a6f66f50b0a03b76b28edc2e 100644 (file)
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -27,7 +27,7 @@ else
 PKGS += ogg
 
 .ogg: libogg
-       #cd $< && autoreconf
+       #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
        cd $< && $(MAKE) install
 endif

diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index a6f27fc3f5af810e11cfdae1ae526571fd145939..aa68e7bcbbfaa668c5af889c07d51023c51a4ef0 100644 (file)
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -15,7 +15,7 @@ libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
        $(UNPACK)
        $(APPLY) $(SRC)/theora/libtheora-includes.patch
 ifdef HAVE_WIN64
-       cd $(UNPACK_DIR) && autoreconf -fi -I m4
+       cd $(UNPACK_DIR) && autoreconf -fi -I m4 $(ACLOCAL_AMFLAGS)
 endif
        $(MOVE)
 

diff --git a/contrib/src/tiger/rules.mak b/contrib/src/tiger/rules.mak
index 26a6012a1baf3d237e9b0ca0a95a70e8565622e1..cd7bc66b5ec34e65b2208c3dd6b1fb9869c33d45 100644 (file)
--- a/contrib/src/tiger/rules.mak
+++ b/contrib/src/tiger/rules.mak
@@ -18,7 +18,7 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger
        $(MOVE)
 
 .tiger: libtiger .kate
-       cd $< && autoreconf -fiv
+       cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc
        cd $< && $(MAKE) install
        touch $@

diff --git a/contrib/src/tremor/rules.mak b/contrib/src/tremor/rules.mak
index 30ba69ea79bacdc8992f3f173d52730dbe0c3cd3..907860b7e76ba65246dc0d5afc75e4ac62d626ef 100644 (file)
--- a/contrib/src/tremor/rules.mak
+++ b/contrib/src/tremor/rules.mak
@@ -24,7 +24,8 @@ tremor: tremor-svn.tar.xz .sum-tremor
 
 .tremor: tremor .ogg
        # Stuff that depends on libogg
+       cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
        cd $< && \
-       $(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./autogen.sh $(HOSTCONF)
+       $(HOSTVARS) CFLAGS="$(CFLAGS) $(NOTHUMB)" ./configure $(HOSTCONF)
        cd $< && $(MAKE) install
        touch $@