post commit test for trac : closes #172

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 6fe1f89e0853299a0232e1afdf76828928c2b4ea..1223b2014cae27d35e8ac90d4273f382a30ed4e8 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -46,7 +46,23 @@ fi
 
 # Check for automake
 amvers="none"
-if automake-1.7 --version >/dev/null 2>&1; then
+if automake-1.8 --version >/dev/null 2>&1; then
+  amvers="-1.8"
+  # 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.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
   if automake-1.6 --version >/dev/null 2>&1; then
@@ -71,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
 
@@ -347,7 +365,8 @@ rm -Rf autom4te.cache
 # remove old autotools extra cruft
 rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
 # remove new autotools extra cruft
-(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh)
+rm -Rf autotools
+mkdir autotools
 # remove libtool cruft
 rm -f ltmain.sh libtool ltconfig
 # remove gettext cruft