shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove 'local' from configure and configure.sh"

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -381,8 +381,8 @@

 # 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

@@ -419,8 +419,8 @@

 }

 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 "##" ""

@@ -470,6 +470,8 @@

     enabled msvs && echo "CONFIG_VS_VERSION=${vs_version}" >> "${1}"

+    CC="${saved_CC}"

+    CXX="${saved_CXX}"

 }

@@ -1314,8 +1316,9 @@

 }

 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

@@ -1323,11 +1326,13 @@

             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`"

@@ -1337,10 +1342,11 @@

             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`"

@@ -1350,9 +1356,10 @@

 }

 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}

@@ -1363,6 +1370,7 @@

 ${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() {

--- a/configure

+++ b/configure

@@ -67,10 +67,10 @@

 EOF

 #restore editor state '

-    local family;

-    local last_family;

-    local c;

-    local str;

+    family="";

+    last_family="";

+    c="";

+    str="";

     for c in ${CODECS}; do

         family=${c%_*}

         if [ "${family}" != "${last_family}" ]; then

@@ -412,7 +412,7 @@

 }

 post_process_cmdline() {

-    local c

+    c=""

     # If the codec family is disabled, disable all components of that family.

     # If the codec family is enabled, enable all components of that family.

@@ -459,8 +459,8 @@

     enabled universal && echo "FAT_ARCHS=${fat_bin_archs}" >> config.mk

     # Calculate the default distribution name, based on the enabled features

-    local cf

-    local DIST_DIR=vpx

+    cf=""

+    DIST_DIR=vpx

     for cf in $CODEC_FAMILIES; do

         if enabled ${cf}_encoder && enabled ${cf}_decoder; then

             DIST_DIR="${DIST_DIR}-${cf}"

@@ -482,7 +482,7 @@

           ;;

     esac

     if [ -f "${source_path}/build/make/version.sh" ]; then

-        local ver=`"$source_path/build/make/version.sh" --bare "$source_path"`

+        ver=`"$source_path/build/make/version.sh" --bare "$source_path"`

         DIST_DIR="${DIST_DIR}-${ver}"

         VERSION_STRING=${ver}

         ver=${ver%%-*}

@@ -516,7 +516,7 @@

     # Write makefiles for all enabled targets

     #

     for tgt in libs examples docs solution; do

-        local tgt_fn="$tgt-$toolchain.mk"

+        tgt_fn="$tgt-$toolchain.mk"

         if enabled $tgt; then

             echo "Creating makefiles for ${toolchain} ${tgt}"

@@ -555,7 +555,7 @@

                     true;

                 ;;

                 *)

-                    local result=false

+                    result=false

                     for d in "$@"; do

                         [ -f "${d##-I}/$header" ] && result=true && break

                     done

@@ -604,7 +604,7 @@

     # Handle universal binaries for this architecture

     case $toolchain in

         universal-darwin*)

-            local darwin_ver=${tgt_os##darwin}

+            darwin_ver=${tgt_os##darwin}

             # Snow Leopard (10.6/darwin10) dropped support for PPC

             # Include PPC support for all prior versions

-- 

⑨