X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=1223b2014cae27d35e8ac90d4273f382a30ed4e8;hb=ef088ae01c51ac657bb86ea44596e0ccacbd30c1;hp=58203a7ec1d76a59492c2b45b5bce445e9d9f071;hpb=163b655bdf461bc56fa33d3bc95ac260a33bf939;p=vlc

diff --git a/bootstrap b/bootstrap
index 58203a7ec1..1223b2014c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,16 +29,40 @@ set -x
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
+ACLOCAL_ARGS="-I m4"
+
 # Check for contrib directory
 if test -d extras/contrib/bin; then
   export PATH=./extras/contrib/bin:$PATH
-  export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
-  export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+  ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+  if test ".`uname -s`" = ".Darwin"; then
+    export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
+    export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+  elif test ".`uname -s`" = ".BeOS"; then
+    export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
+    export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
+  fi
 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
@@ -63,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
 
@@ -339,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
@@ -360,7 +387,7 @@ fi
 
 # Do the rest
 ${autopoint} -f
-${aclocal} -I m4
+${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}
 ${automake} --add-missing --copy