Merge "configure: echo --(disable|enable)-* cmdline options"

This commit is contained in:
James Zern 2015-01-30 13:16:02 -08:00 committed by Gerrit Code Review
commit d2493313ae

View File

@ -201,7 +201,7 @@ disabled(){
soft_enable() { soft_enable() {
for var in $*; do for var in $*; do
if ! disabled $var; then if ! disabled $var; then
log_echo " enabling $var" enabled $var || log_echo " enabling $var"
enable_feature $var enable_feature $var
fi fi
done done
@ -210,7 +210,7 @@ soft_enable() {
soft_disable() { soft_disable() {
for var in $*; do for var in $*; do
if ! enabled $var; then if ! enabled $var; then
log_echo " disabling $var" disabled $var || log_echo " disabling $var"
disable_feature $var disable_feature $var
fi fi
done done
@ -508,9 +508,11 @@ process_common_cmdline() {
elif [ $action = "disable" ] && ! disabled $option ; then elif [ $action = "disable" ] && ! disabled $option ; then
echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||
die_unknown $opt die_unknown $opt
log_echo " disabling $option"
elif [ $action = "enable" ] && ! enabled $option ; then elif [ $action = "enable" ] && ! enabled $option ; then
echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null || echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||
die_unknown $opt die_unknown $opt
log_echo " enabling $option"
fi fi
${action}_feature $option ${action}_feature $option
;; ;;