generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure.sh: avoid test -a/-o for compatibility

Browse Source 
Change-Id: I0bea5cbccd6938fb967299c1d903b60dd2096ccc
This commit is contained in:
James Zern 2014-07-29 23:25:15 -07:00
parent d6cf6eb570
commit 8753f9c5e3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/make/configure.sh
View File

@ -252,7 +252,7 @@ tolower(){
# #
source_path=${0%/*} source_path=${0%/*}
enable_feature source_path_used enable_feature source_path_used
if test -z "$source_path" -o "$source_path" = "." ; then if [ -z "$source_path" ] || [ "$source_path" = "." ]; then
source_path="`pwd`" source_path="`pwd`"
disable_feature source_path_used disable_feature source_path_used
fi fi
@ -549,7 +549,8 @@ process_common_cmdline() {
alt_libc="${optval}" alt_libc="${optval}"
;; ;;
--as=*) --as=*)
[ "${optval}" = yasm -o "${optval}" = nasm -o "${optval}" = auto ] \ [ "${optval}" = yasm ] || [ "${optval}" = nasm ] \
|| [ "${optval}" = auto ] \
|| die "Must be yasm, nasm or auto: ${optval}" || die "Must be yasm, nasm or auto: ${optval}"
alt_as="${optval}" alt_as="${optval}"
;; ;;
@ -557,8 +558,8 @@ process_common_cmdline() {
w="${optval%%x*}" w="${optval%%x*}"
h="${optval##*x}" h="${optval##*x}"
VAR_LIST="DECODE_WIDTH_LIMIT ${w} DECODE_HEIGHT_LIMIT ${h}" VAR_LIST="DECODE_WIDTH_LIMIT ${w} DECODE_HEIGHT_LIMIT ${h}"
[ ${w} -gt 0 -a ${h} -gt 0 ] || die "Invalid size-limit: too small." [ ${w} -gt 0 ] && [ ${h} -gt 0 ] || die "Invalid size-limit: too small."
[ ${w} -lt 65536 -a ${h} -lt 65536 ] \ [ ${w} -lt 65536 ] && [ ${h} -lt 65536 ] \
|| die "Invalid size-limit: too big." || die "Invalid size-limit: too big."
enable_feature size_limit enable_feature size_limit
;; ;;
@ -1152,7 +1153,7 @@ EOF
auto|"") auto|"")
which nasm >/dev/null 2>&1 && AS=nasm which nasm >/dev/null 2>&1 && AS=nasm
which yasm >/dev/null 2>&1 && AS=yasm 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" && die "Neither yasm nor nasm have been found"
;; ;;
esac esac