[vlc-commits] Extras/tools: force the last version of m4

Jean-Baptiste Kempf git at videolan.org
Thu Aug 15 20:42:39 CEST 2013


vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Aug 15 16:52:17 2013 +0200| [429f6b68df7cbf9dcff8a13b55c04de4aa4714c2] | committer: Jean-Baptiste Kempf

Extras/tools: force the last version of m4

Previous ones are refused by autoconf

(cherry picked from commit 3581f8630a64c5f583effd643c4b899404ec8f5f)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=429f6b68df7cbf9dcff8a13b55c04de4aa4714c2
---

 extras/tools/bootstrap |    2 +-
 extras/tools/tools.mak |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 2dd747f..f9e991d 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -56,7 +56,7 @@ fi
 
 check autoconf 2.67
 check automake 1.11
-check m4
+check m4 1.4.16
 check libtool 2.2
 check pkg-config
 check cmake
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 440c090..f7efcfa 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -171,7 +171,7 @@ m4: m4-$(M4_VERSION).tar.gz
 	$(UNPACK)
 	$(MOVE)
 
-.m4: m4 .autoconf
+.m4: m4
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
 	touch $@
 



More information about the vlc-commits mailing list