Qt: Simple Preferences: conditionally hide the whole groupbox, not

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 3972f6fc8061091f93d404e57f4efab4e06c5b85..6bf7bd5520e0b40d32b436973322144ffc2032e0 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -29,6 +29,7 @@ usage()
        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]"
+       echo "  --disable-gpl    configure to not build viral GPL code"
 }
 
 BUILD=
@@ -38,6 +39,7 @@ PKGS_ENABLE=
 PKGS_DISABLE=
 BUILD_ENCODERS="1"
 BUILD_DISCS="1"
+GPL="1"
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -70,6 +72,9 @@ do
                --enable-small)
                        ENABLE_SMALL=1
                        ;;
+               --disable-gpl)
+                       GPL=
+                       ;;
                --disable-*)
                        PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
                        ;;
@@ -113,7 +118,7 @@ fi
 # Prepare files
 #
 echo "Creating configuration file... config.mak"
-exec 3>config.mak
+exec 3>config.mak || exit $?
 cat >&3 << EOF
 # This file was automatically generated.
 # Any change will be overwritten if ../bootstrap is run again.
@@ -143,7 +148,7 @@ add_make_enabled()
 
 check_macosx_sdk()
 {
-   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.6" && OSX_VERSION=10.6
+   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
    if test -z "$SDKROOT"
    then
       SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
@@ -163,6 +168,7 @@ check_macosx_sdk()
       exit 1
    fi
 
+   add_make "MACOSX_SDK=${SDKROOT}"
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
 }
 
@@ -190,13 +196,16 @@ check_android_sdk()
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
        [ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
        add_make "ANDROID_ABI := ${ANDROID_ABI}"
-       test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+       [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
+       [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
+       [ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled "HAVE_ARMV6"
 }
 
 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"
+test -z "$GPL" || add_make_enabled "GPL"
 
 #
 # Checks
@@ -210,7 +219,7 @@ case "${OS}" in
                        add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                else
                        check_ios_sdk
-                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
+                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
                fi
                ;;
        *bsd*)
@@ -221,15 +230,12 @@ case "${OS}" in
                add_make_enabled "HAVE_LINUX" "HAVE_ANDROID"
                case "${HOST}" in
                        *arm*)
-                       add_make "PATH = ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
                        add_make "PLATFORM_SHORT_ARCH := arm"
                        ;;
                        *i686*)
-                       add_make "PATH = ${ANDROID_NDK}/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
                        add_make "PLATFORM_SHORT_ARCH := x86"
                        ;;
                        *mipsel*)
-                       add_make "PATH = ${ANDROID_NDK}/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin/:${PATH}"
                        add_make "PLATFORM_SHORT_ARCH := mips"
                        ;;
                esac
@@ -249,7 +255,7 @@ esac
 # Results output
 #
 test -e Makefile && unlink Makefile
-ln -sf ../../contrib/src/main.mak Makefile
+ln -sf ../../contrib/src/main.mak Makefile || exit $?
 cat << EOF
 Bootstrap completed.
 
@@ -267,4 +273,4 @@ Other targets:
  * make package      prepare prebuilt packages
 EOF
 
-mkdir -p ../../contrib/tarballs
+mkdir -p ../../contrib/tarballs || exit $?