Add aspect ratio and chroma option to the rawvid demux.

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 06199fd013ff483d1b5e0c7af03d3a799c82ed07..c29edb9984f690a410a3cf49c8d8d07d29a49a85 100755 (executable)
--- 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
@@ -46,11 +46,23 @@ if test -d extras/contrib/bin; then
     export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
     export BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
   fi
+elif test ".`uname -s`" = ".Darwin"; then
+  set +x
+  echo ""
+  echo "ERR: Contribs haven't been built"
+  echo "ERR: Please run:"
+  echo "ERR: "
+  echo "ERR:    'cd extras/contrib && ./bootstrap && make && cd ../..'"
+  echo "ERR: "
+  echo "ERR: Make sure fink has been disabled too."
+  echo ""
+  set -x
+  exit 1
 fi
 
 # Check for autoconf
 rm -f m4/autoconf260.m4
-case "$(autoconf --version|head -1)" in
+case "$(autoconf --version|head -n 1)" in
   *2.5[012345678]*)
     echo "Hey, your autoconf is quite old. Update it." >&2
     exit 1
@@ -64,10 +76,10 @@ esac
 
 # Check for automake
 amvers="no"
-for v in "-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="${v}"
+    amvers="`echo ${v} | sed -e 's/^-//'`"
     break
   fi
 done
@@ -78,9 +90,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
@@ -125,8 +137,8 @@ else
   PKGCONFIG=no
 fi
 
-aclocal=aclocal${amvers}
-automake=automake${amvers}
+aclocal=aclocal${amsuff}
+automake=automake${amsuff}
 autoconf=autoconf
 autoheader=autoheader