[vlc-devel] commit: contribs: Use autoreconf --force to avoid libtool pb. ( Christophe Mutricy )

[git version control]

vlc | branch: 1.0-bugfix | Christophe Mutricy <xtophe at videolan.org> | Thu Jun 18 19:12:09 2009 +0200| [7baf9cf0af70e620361da906f8a211d2f6215e38] | committer: Rémi Denis-Courmont 

contribs: Use autoreconf --force to avoid libtool pb.

Also use autoreconf where possible
And no need to reun automake after autoreconf
(cherry picked from commit 968754f8cd40aba25e732cbeaaf092827c9dd73d)

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7baf9cf0af70e620361da906f8a211d2f6215e38
---

 extras/contrib/src/Makefile |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d7a54ef..83ef624 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -475,7 +475,7 @@ fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz Patches/fontconfig.patch
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/fontconfig.patch
 	patch -p0 < Patches/fontconfig-nodocs.patch
-	(cd $@; autoreconf)
+	(cd $@; autoreconf -ivf)
 
 .fontconfig: fontconfig .xml .freetype
 ifdef HAVE_WIN32
@@ -1339,7 +1339,7 @@ endif
 ifdef HAVE_DARWIN_OS
 	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
 else
-	(cd $< && rm -f configure; aclocal -I m4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
+	(cd $< && rm -f configure; ACLOCAL="aclocal -I m4/" autoreconf -ivf && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
 endif
 	touch $@
 
@@ -1470,7 +1470,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
 	patch -p0 < Patches/libmodplug-win32.patch
-	(cd $@; autoreconf)
+	(cd $@; autoreconf -ivf )
 endif
 
 .mod: libmodplug
@@ -1787,7 +1787,7 @@ zvbi-$(ZVBI_VERSION).tar.bz2:
 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-	(cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf)
+	(cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf -ivf)
 endif
 
 ifdef HAVE_WIN32
@@ -2188,7 +2188,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2:
 mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	patch -p0 < Patches/mpcdec.patch
-	(cd $@; autoreconf)
+	(cd $@; autoreconf -ivf)
 
 .mpcdec: mpcdec
 ifdef HAVE_WIN32
@@ -2547,7 +2547,7 @@ libass: libass-$(ASS_VERSION).tar.bz2
 	(cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch)
 ifneq ($(HOST),$(BUILD))
 	patch -p0 < Patches/libass-cross.patch
-	(cd $@; autoreconf; automake)
+	(cd $@; autoreconf -ivf)
 endif
 
 .libass: libass .png