From c9a3688176a1571ab5cd9b77b6fddc3e1a110b62 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Sun, 27 Nov 2011 06:14:26 -0500
Subject: [PATCH] contrib: run $(RECONF) in an arbitrary list of packages

Now they recognize arm-linux-androideabi toolchain
---
 contrib/src/dvbpsi/rules.mak     | 1 +
 contrib/src/flac/rules.mak       | 3 ++-
 contrib/src/modplug/rules.mak    | 1 +
 contrib/src/ogg/rules.mak        | 2 +-
 contrib/src/samplerate/rules.mak | 1 +
 contrib/src/theora/rules.mak     | 2 --
 contrib/src/upnp/rules.mak       | 2 --
 contrib/src/vorbis/rules.mak     | 1 +
 8 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index a28cd04b6f..093e62064f 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -18,6 +18,7 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
 	$(MOVE)
 
 .dvbpsi: libdvbpsi
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-release
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index efb402b7d4..9b1aa0d757 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -23,7 +23,7 @@ endif
 	$(MOVE)
 
 FLACCONF := $(HOSTCONF) \
-	--disable--thorough-tests \
+	--disable-thorough-tests \
 	--disable-doxygen-docs \
 	--disable-xmms-plugin \
 	--disable-cpplibs \
@@ -38,6 +38,7 @@ endif
 DEPS_flac = ogg $(DEPS_ogg)
 
 .flac: flac
+	$(RECONF) -I m4
 	cd $< && $(HOSTVARS) ./configure $(FLACCONF)
 	cd $</src && $(MAKE) -C libFLAC install
 	cd $< && $(MAKE) -C include install
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 378fd18d91..abdb55b643 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,6 +18,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
 	$(MOVE)
 
 .modplug: libmodplug
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 3c84f1875c..1c8489582b 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -25,7 +25,7 @@ endif
 	$(MOVE)
 
 .ogg: libogg
-	#$(RECONF)
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 6766e469dc..113353fd0a 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -17,6 +17,7 @@ samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
 	$(MOVE)
 
 .samplerate: samplerate
+	$(RECONF) -I M4
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index c3b6c1e899..fc380e5a73 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -43,9 +43,7 @@ endif
 DEPS_theora = ogg $(DEPS_ogg)
 
 .theora: libtheora
-ifdef HAVE_WIN32
 	$(RECONF)
-endif
 	cd $< && $(HOSTVARS) ./configure $(THEORACONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 8c6184abc1..6bf59071f3 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -24,9 +24,7 @@ endif
 	$(MOVE)
 
 .upnp: upnp
-ifdef HAVE_WIN32
 	$(RECONF)
-endif
 	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3 -DUPNP_STATIC_LIB $(LIBUPNP_ECFLAGS)" ./configure --disable-samples --without-documentation --disable-webserver $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 89df9377d6..3ca09506e8 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -30,6 +30,7 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 DEPS_vorbis = ogg $(DEPS_ogg)
 
 .vorbis: libvorbis
+	$(RECONF) -I m4
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest
 	cd $< && $(MAKE) install
 	touch $@
-- 
2.39.5