X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=9ba0109c8a1014d38d3684d2ec8fad8fbd9a0ab9;hb=6583881be61b296b48c3e0c52b49d1a8859029a7;hp=52a754ad4d4c1c1883182365aca90767e00a6f1d;hpb=5319a4b4be9c78f1a912f823e723db83f0a24c7a;p=vlc

diff --git a/bootstrap b/bootstrap
index 52a754ad4d..9ba0109c8a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -9,8 +9,7 @@
 
 if test "$#" != "0"; then
   echo "Usage: $0"
-  echo "  Calls automake, autoconf, autoheader, autopoint and other auto* to generate"
-  echo "  m4 macros and prepare Makefiles."
+  echo "  Calls autoreconf to generate m4 macros and prepare Makefiles."
   exit 1
 fi
 
@@ -56,17 +55,6 @@ elif test ".`uname -s`" = ".Darwin"; then
   exit 1
 fi
 
-# Check for autoconf
-rm -f m4/autoconf260.m4
-case "$(autoreconf --version|head -n 1)" in
-  *2.59*)
-    echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
-    echo "Press Enter to continue"
-    read
-    cp -f extras/buildsystem/autotools/m4/autoconf260.m4 m4/
-    ;;
-esac
-
 # Check for pkg-config
 if pkg-config --version >/dev/null 2>&1; then
   # We have pkg-config, everything is cool.