[vlc-commits] commit: contribs: automake 1.11 needs a recent autoconf ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Tue Nov  2 07:33:22 2010 +0100| [1b4f18fd499d9953ce7cf2a35a8b37426f40f958] | committer: Rafaël Carré 

contribs: automake 1.11 needs a recent autoconf

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

 extras/contrib/src/contrib-src.mak |   18 ++++++++++++++++--
 extras/contrib/src/packages.mak    |    2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 36d47e9..8323a38 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -299,16 +299,30 @@ CLEAN_FILE += .libtool
 endif
 
 # ***************************************************************************
-# automake
+# autotools
 # ***************************************************************************
 
+autoconf-$(AUTOCONF_VERSION).tar.bz2:
+	$(WGET) $(AUTOCONF_URL)
+
+autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+
+.autoconf: autoconf
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	touch $@
+
+CLEAN_FILE += .autoconf
+CLEAN_PKG += autoconf
+DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
+
 automake-$(AUTOMAKE_VERSION).tar.gz:
 	$(WGET) $(AUTOMAKE_URL)
 
 automake: automake-$(AUTOMAKE_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
-.automake: automake
+.automake: automake .autoconf
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
 	touch $@
 
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index a090c99..c55fb33 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -38,6 +38,8 @@ CMAKE_VERSION=2.6.4
 CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=2.2.10
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
+AUTOCONF_VERSION=2.68
+AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOMAKE_VERSION=1.11.1
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 PKGCFG_VERSION=0.23