avformat : add an option to force a specific format

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 647a6002ecb3fcb59b6413f04ace6fb70e1d982e..a4b541084eff5449bcb8b51eb5c11d4d94eafa38 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -151,6 +151,13 @@ check_macosx_sdk()
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
 }
 
+check_android_sdk()
+{
+       [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
+       add_make "ANDROID_NDK := ${ANDROID_NDK}"
+       test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+}
+
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
@@ -170,6 +177,11 @@ case "${OS}" in
        *bsd*)
                add_make_enabled "HAVE_BSD"
                ;;
+       linux-androideabi)
+               check_android_sdk
+               add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
+               add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
+               ;;
        *linux*)
                add_make_enabled "HAVE_LINUX"
                ;;
@@ -193,12 +205,14 @@ Run "make" to start compilation.
 
 Other targets:
  * make install      same as "make"
+ * make prebuilt     fetch and install prebuilt binaries
+ * make list         list packages
  * make fetch        fetch required source tarballs
  * make fetch-all    fetch all source tarballs
  * make distclean    clean everything and undo bootstrap
  * make mostlyclean  clean everything except source tarballs
  * make clean        clean everything
- * make list         list packages
+ * make package      prepare prebuilt packages
 EOF
 
 mkdir -p ../../contrib/tarballs