libvpx: Pull from upstream

source/libvpx/build/make/configure.sh

 #!/bin/sh
 ##
 ##  configure.sh
 ##
 ##  This script is sourced by the main configure script and contains
 ##  utility functions and other common bits that aren't strictly libvpx
 ##  related.
 ##
 ##  This build system is based in part on the FFmpeg configure script.
 ##
@@ skipping 234 matching lines @@
 tolower(){
     echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
 
 #
 # Temporary File Functions
 #
 source_path=${0%/*}
 enable_feature source_path_used
-if test -z "$source_path" -o "$source_path" = "." ; then
+if [ -z "$source_path" ] || [ "$source_path" = "." ]; then
     source_path="`pwd`"
     disable_feature source_path_used
 fi
 
 if test ! -z "$TMPDIR" ; then
     TMPDIRx="${TMPDIR}"
 elif test ! -z "$TEMPDIR" ; then
     TMPDIRx="${TEMPDIR}"
 else
     TMPDIRx="/tmp"
@@ skipping 108 matching lines @@
     check_cmd ${AS} ${ASFLAGS} -o ${TMP_O} ${TMP_ASM}
     readelf -WS ${TMP_O} >${TMP_X}
     log_file ${TMP_X}
     if ! grep -q '\.rodata .* 16$' ${TMP_X}; then
         die "${AS} ${ASFLAGS} does not support section alignment (nasm <=2.08?)"
     fi
 }
 
 # tests for -m$1 toggling the feature given in $2. If $2 is empty $1 is used.
 check_gcc_machine_option() {
-    local opt="$1"
-    local feature="$2"
+    opt="$1"
+    feature="$2"
     [ -n "$feature" ] || feature="$opt"
 
     if enabled gcc && ! disabled "$feature" && ! check_cflags "-m$opt"; then
         RTCD_OPTIONS="${RTCD_OPTIONS}--disable-$feature "
     else
         soft_enable "$feature"
     fi
 }
 
 write_common_config_banner() {
@@ skipping 16 matching lines @@
             else
                 fwrite config.mk "ALL_TARGETS += ${t}"
             fi
         fi
     true;
     done
 true
 }
 
 write_common_target_config_mk() {
-    local CC="${CC}"
-    local CXX="${CXX}"
+    saved_CC="${CC}"
+    saved_CXX="${CXX}"
     enabled ccache && CC="ccache ${CC}"
     enabled ccache && CXX="ccache ${CXX}"
     print_webm_license $1 "##" ""
 
     cat >> $1 << EOF
 # This file automatically generated by configure. Do not edit!
 SRC_PATH="$source_path"
 SRC_PATH_BARE=$source_path
 BUILD_PFX=${BUILD_PFX}
 TOOLCHAIN=${toolchain}
@@ skipping 29 matching lines @@
 EOF
     fi
 
     print_config_mk ARCH   "${1}" ${ARCH_LIST}
     print_config_mk HAVE   "${1}" ${HAVE_LIST}
     print_config_mk CONFIG "${1}" ${CONFIG_LIST}
     print_config_mk HAVE   "${1}" gnu_strip
 
     enabled msvs && echo "CONFIG_VS_VERSION=${vs_version}" >> "${1}"
 
+    CC="${saved_CC}"
+    CXX="${saved_CXX}"
 }
 
 
 write_common_target_config_h() {
     print_webm_license ${TMP_H} "/*" " */"
     cat >> ${TMP_H} << EOF
 /* This file automatically generated by configure. Do not edit! */
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
 #define RESTRICT    ${RESTRICT}
@@ skipping 57 matching lines @@
         --force-enable-?*|--force-disable-?*)
         eval `echo "$opt" | sed 's/--force-/action=/;s/-/ option=/;s/-/_/g'`
         ${action}_feature $option
         ;;
         --libc=*)
         [ -d "${optval}" ] || die "Not a directory: ${optval}"
         disable_feature builtin_libc
         alt_libc="${optval}"
         ;;
         --as=*)
-        [ "${optval}" = yasm -o "${optval}" = nasm -o "${optval}" = auto ] \
+        [ "${optval}" = yasm ] || [ "${optval}" = nasm ] \
+            || [ "${optval}" = auto ] \
             || die "Must be yasm, nasm or auto: ${optval}"
         alt_as="${optval}"
         ;;
         --size-limit=*)
         w="${optval%%x*}"
         h="${optval##*x}"
         VAR_LIST="DECODE_WIDTH_LIMIT ${w} DECODE_HEIGHT_LIMIT ${h}"
-        [ ${w} -gt 0 -a ${h} -gt 0 ] || die "Invalid size-limit: too small."
-        [ ${w} -lt 65536 -a ${h} -lt 65536 ] \
+        [ ${w} -gt 0 ] && [ ${h} -gt 0 ] || die "Invalid size-limit: too small."
+        [ ${w} -lt 65536 ] && [ ${h} -lt 65536 ] \
             || die "Invalid size-limit: too big."
         enable_feature size_limit
         ;;
         --prefix=*)
         prefix="${optval}"
         ;;
         --libdir=*)
         libdir="${optval}"
         ;;
         --sdk-path=*)
@@ skipping 573 matching lines @@
         check_gcc_machine_option sse3
         check_gcc_machine_option ssse3
         check_gcc_machine_option sse4 sse4_1
         check_gcc_machine_option avx
         check_gcc_machine_option avx2
 
         case "${AS}" in
             auto|"")
                 which nasm >/dev/null 2>&1 && AS=nasm
                 which yasm >/dev/null 2>&1 && AS=yasm
-                [ "${AS}" = auto -o -z "${AS}" ] \
+                [ "${AS}" = auto ] || [ -z "${AS}" ] \
                     && die "Neither yasm nor nasm have been found"
             ;;
         esac
         log_echo "  using $AS"
         [ "${AS##*/}" = nasm ] && add_asflags -Ox
         AS_SFX=.asm
         case  ${tgt_os} in
             win32)
                 add_asflags -f win32
                 enabled debug && add_asflags -g cv8
@@ skipping 143 matching lines @@
         check_add_cflags ${extra_cflags} || \
         die "Requested extra CFLAGS '${extra_cflags}' not supported by compiler"
     fi
 }
 
 process_toolchain() {
     process_common_toolchain
 }
 
 print_config_mk() {
-    local prefix=$1
-    local makefile=$2
+    saved_prefix="${prefix}"
+    prefix=$1
+    makefile=$2
     shift 2
     for cfg; do
         if enabled $cfg; then
             upname="`toupper $cfg`"
             echo "${prefix}_${upname}=yes" >> $makefile
         fi
     done
+    prefix="${saved_prefix}"
 }
 
 print_config_h() {
-    local prefix=$1
-    local header=$2
+    saved_prefix="${prefix}"
+    prefix=$1
+    header=$2
     shift 2
     for cfg; do
         upname="`toupper $cfg`"
         if enabled $cfg; then
             echo "#define ${prefix}_${upname} 1" >> $header
         else
             echo "#define ${prefix}_${upname} 0" >> $header
         fi
     done
+    prefix="${saved_prefix}"
 }
 
 print_config_vars_h() {
-    local header=$1
+    header=$1
     shift
     while [ $# -gt 0 ]; do
         upname="`toupper $1`"
         echo "#define ${upname} $2" >> $header
         shift 2
     done
 }
 
 print_webm_license() {
-    local destination=$1
-    local prefix="$2"
-    local suffix="$3"
+    saved_prefix="${prefix}"
+    destination=$1
+    prefix="$2"
+    suffix="$3"
     shift 3
     cat <<EOF > ${destination}
 ${prefix} Copyright (c) 2011 The WebM project authors. All Rights Reserved.${suffix}
 ${prefix} ${suffix}
 ${prefix} Use of this source code is governed by a BSD-style license${suffix}
 ${prefix} that can be found in the LICENSE file in the root of the source${suffix}
 ${prefix} tree. An additional intellectual property rights grant can be found${suffix}
 ${prefix} in the file PATENTS.  All contributing project authors may${suffix}
 ${prefix} be found in the AUTHORS file in the root of the source tree.${suffix}
 EOF
+    prefix="${saved_prefix}"
 }
 
 process_targets() {
     true;
 }
 
 process_detect() {
     true;
 }
 
@@ skipping 19 matching lines @@
     # Prepare the PWD for building.
     for f in ${OOT_INSTALLS}; do
             install -D "${source_path}/$f" "$f"
     done
     fi
     cp "${source_path}/build/make/Makefile" .
 
     clean_temp_files
     true
 }