X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=1223b2014cae27d35e8ac90d4273f382a30ed4e8;hb=a2de6063b8eee5221ff13775ca89fee2666387a3;hp=bfadd4e01df9d8f146a55bf1d6a126eec4f343ac;hpb=1295a9b8020d2c2c16525cf21fd6b05623af4f02;p=vlc

diff --git a/bootstrap b/bootstrap
index bfadd4e01d..1223b2014c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -54,6 +54,14 @@ if automake-1.8 --version >/dev/null 2>&1; then
       amvers="-1.6"
     fi
   fi
+elif automake-1.9 --version >/dev/null 2>&1; then
+  amvers="-1.9"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
 elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
   # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
@@ -79,6 +87,8 @@ elif automake --version > /dev/null 2>&1; then
       INSTALLSUCKS=yes ;;
     1.6|1.6.0|1.6.1)
       AUTOMAKESUCKS=yes ;;
+    1.9|1.9.2)
+      ;;
   esac
 fi