X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=ba7c30e81bdf88b2dcd835954d38b492765bc1cf;hb=8cd231f505c491b252155093735ed050a462428c;hp=54c112c3e6f8f9c340730927ab4c982a8ae5c331;hpb=6871383f306321f5db33fa80feaa048a0ef7ee0e;p=vlc

diff --git a/bootstrap b/bootstrap
index 54c112c3e6..ba7c30e81b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -31,7 +31,7 @@ set -x
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
-ACLOCAL_ARGS="-I m4"
+ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
 # Check for contrib directory
 if test -d extras/contrib/bin; then
@@ -64,7 +64,7 @@ esac
 
 # Check for automake
 amvers="no"
-for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
+for v in "-1.10" "110" "-1.9" "19"; do
   if automake${v} --version >/dev/null 2>&1; then
     amsuff="${v}"
     amvers="`echo ${v} | sed -e 's/^-//'`"
@@ -78,9 +78,9 @@ if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
 fi
 
 case "${amvers}" in
-  no|1.[0123456]|1.[0123456].*|1[0123456]|1.[0123456]-*)
+  no|1.[012345678]|1.[0123456].*|1[0123456]|1.[0123456]-*)
     set +x
-    echo "$0: you need automake version 1.7 or later"
+    echo "$0: you need automake version 1.9 or later"
     exit 1
     ;;
 esac