diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:11:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:11:44 +0200 |
commit | 085a4e6b16bf31ad5a245a7de993d29ff98fb3ea (patch) | |
tree | 212508a2a2502c02fbd1bb7ac9ee330293c2511d /configure | |
parent | 482c1ac849faa783a1694222837c9c9cb619237f (diff) | |
parent | 4d810ad2e943a59658ddf00a397121c2b62f7157 (diff) | |
download | ffmpeg-085a4e6b16bf31ad5a245a7de993d29ff98fb3ea.tar.gz |
Merge commit '4d810ad2e943a59658ddf00a397121c2b62f7157'
* commit '4d810ad2e943a59658ddf00a397121c2b62f7157':
configure: Use a different variable name in push/popvar
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -475,21 +475,21 @@ get_safe(){ } pushvar(){ - for var in $*; do - eval level=\${${var}_level:=0} - eval ${var}_${level}="\$$var" - eval ${var}_level=$(($level+1)) + for pvar in $*; do + eval level=\${${pvar}_level:=0} + eval ${pvar}_${level}="\$$pvar" + eval ${pvar}_level=$(($level+1)) done } popvar(){ - for var in $*; do - eval level=\${${var}_level:-0} + for pvar in $*; do + eval level=\${${pvar}_level:-0} test $level = 0 && continue eval level=$(($level-1)) - eval $var="\${${var}_${level}}" - eval ${var}_level=$level - eval unset ${var}_${level} + eval $pvar="\${${pvar}_${level}}" + eval ${pvar}_level=$level + eval unset ${pvar}_${level} done } |