Tools: add m4

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index ef250509796637604abf07d8fa1b7ce1b9bd070b..2dd747fd636bf2cfe6fd88ca66291b20e030535f 100755 (executable)
--- 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 be7aed47785dc2435d43facf3887ae71462757a5..3fe65f913bd1093f53289ccd497d1204955ed5ee 100644 (file)
--- 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 ee419b023de861e70fe9ab28feef4728c4121279..fc95715d2f90f88dfeadf5e5bce7b204bce85358 100644 (file)
--- 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: