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

Merge "Configuration: Use 'is_in' instead of echo | grep"

Browse Source
This commit is contained in:
Johann Koenig 2016-06-19 23:51:33 +00:00 committed by Gerrit Code Review
commit 188420f4fd
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/make/configure.sh
View File

@ -540,22 +540,20 @@ process_common_cmdline() {
;; ;;
--enable-?*|--disable-?*) --enable-?*|--disable-?*)
eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
if echo "${ARCH_EXT_LIST}" | grep "^ *$option\$" >/dev/null; then if is_in ${option} ${ARCH_EXT_LIST}; then
[ $action = "disable" ] && RTCD_OPTIONS="${RTCD_OPTIONS}--disable-${option} " [ $action = "disable" ] && RTCD_OPTIONS="${RTCD_OPTIONS}--disable-${option} "
elif [ $action = "disable" ] && ! disabled $option ; then elif [ $action = "disable" ] && ! disabled $option ; then
echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || is_in ${option} ${CMDLINE_SELECT} || die_unknown $opt
die_unknown $opt
log_echo " disabling $option" log_echo " disabling $option"
elif [ $action = "enable" ] && ! enabled $option ; then elif [ $action = "enable" ] && ! enabled $option ; then
echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || is_in ${option} ${CMDLINE_SELECT} || die_unknown $opt
die_unknown $opt
log_echo " enabling $option" log_echo " enabling $option"
fi fi
${action}_feature $option ${action}_feature $option
;; ;;
--require-?*) --require-?*)
eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
if echo "${ARCH_EXT_LIST}" none | grep "^ *$option\$" >/dev/null; then if is_in ${option} ${ARCH_EXT_LIST}; then
RTCD_OPTIONS="${RTCD_OPTIONS}${opt} " RTCD_OPTIONS="${RTCD_OPTIONS}${opt} "
else else
die_unknown $opt die_unknown $opt

2
configure vendored
View File

@ -396,7 +396,7 @@ process_cmdline() {
;; ;;
--enable-?*|--disable-?*) --enable-?*|--disable-?*)
eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
if echo "${EXPERIMENT_LIST}" | grep "^ *$option\$" >/dev/null; then if is_in ${option} ${EXPERIMENT_LIST}; then
if enabled experimental; then if enabled experimental; then
${action}_feature $option ${action}_feature $option
else else