contrib: helper to merge Libs and Libs.private in pkg-config files

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 9ad10682ef040316ec3eb284688f0f8a61160d11..32db64292d0588c56223cfa05651dbbb6fad40df 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -28,6 +28,7 @@ usage()
        echo "  --enable-FOO     configure to build package FOO"
        echo "  --disable-disc   configure to not build optical discs packages"
        echo "  --disable-sout   configure to not build stream output packages"
+       echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
 }
 
 BUILD=
@@ -66,6 +67,9 @@ do
                --disable-sout)
                        BUILD_ENCODERS=
                        ;;
+               --enable-small)
+                       ENABLE_SMALL=1
+                       ;;
                --disable-*)
                        PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
                        ;;
@@ -161,6 +165,7 @@ check_android_sdk()
 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"
+test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 
 #
 # Checks
@@ -180,6 +185,7 @@ case "${OS}" in
        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"