X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=6dc6ac62eb15ddd1d517d4acacdaabe8322a22a0;hb=997c5859d2ab8e7bc613d1c8654335a92c41b0f8;hp=c919a3c8d0c007d51ec9f22b2e4419c42bd48cae;hpb=47eb22002c8777a8dab0f6e8cb89054cbfd73b45;p=vlc

diff --git a/bootstrap b/bootstrap
index c919a3c8d0..6dc6ac62eb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -6,8 +6,6 @@
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 ##           Rémi Denis-Courmont <rem # videolan # org>
-##
-## Muahaha! no annoying dollar I dee dollar that causes rebuild at commit
 
 if test "$#" != "0"; then
   echo "Usage: $0"
@@ -50,6 +48,20 @@ if test -d extras/contrib/bin; then
   fi
 fi
 
+# Check for autoconf
+rm -f m4/autoconf260.m4
+case "$(autoconf --version|head -1)" in
+  *2.5[012345678]*)
+    echo "Hey, your autoconf is quite old. Update it." >&2
+    exit 1
+    ;;
+
+  *2.59*)
+    echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
+    cp -f extras/m4/autoconf260.m4 m4/
+    ;;
+esac
+
 # Check for automake
 amvers="no"
 for v in "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
@@ -472,7 +484,6 @@ ${automake} --add-missing --copy -Wall
 ##
 rm -f vlc-config.in vlc-config
 rm -f src/misc/modules_builtin.h
-rm -f mozilla/vlcintf.h
 
 # Shut up
 set +x