vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Sep 11 17:03:21 2012 +0200| [42551ffdab39ca61afccc5928bf659474015aba2] | committer: Jean-Baptiste Kempf
Tools: add m4 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42551ffdab39ca61afccc5928bf659474015aba2 --- extras/tools/bootstrap | 1 + extras/tools/packages.mak | 3 +++ extras/tools/tools.mak | 17 +++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap index ef25050..2dd747f 100755 --- a/extras/tools/bootstrap +++ b/extras/tools/bootstrap @@ -56,6 +56,7 @@ fi check autoconf 2.67 check automake 1.11 +check m4 check libtool 2.2 check pkg-config check cmake diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak index be7aed4..3fe65f9 100644 --- a/extras/tools/packages.mak +++ b/extras/tools/packages.mak @@ -16,6 +16,9 @@ AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2 AUTOMAKE_VERSION=1.11.2 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz +M4_VERSION=1.4.16 +M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz + PKGCFG_VERSION=0.27.1-1 #PKGCFG_URL=http://downloads.videolan.org/pub/videolan/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz PKGCFG_URL=http://sourceforge.net/projects/pkgconfiglite/files/$(PKGCFG_VERSION)/pkg-config-lite-$(PKGCFG_VERSION).tar.gz/download diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index ee419b0..fc95715 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -162,6 +162,23 @@ CLEAN_FILE += .automake CLEAN_PKG += automake DISTCLEAN_PKG += automake-$(AUTOMAKE_VERSION).tar.gz +# m4 + +m4-$(M4_VERSION).tar.gz: + $(call download,$(M4_URL)) + +m4: m4-$(M4_VERSION).tar.gz + $(UNPACK) + $(MOVE) + +.m4: m4 .autoconf + (cd $<; ./configure --prefix=$(PREFIX) && make && make install) + touch $@ + +CLEAN_FILE += .m4 +CLEAN_PKG += m4 +DISTCLEAN_PKG += m4-$(M4_VERSION).tar.gz + # pkg-config pkg-config-$(PKGCFG_VERSION).tar.gz: _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
