From ccb6bdca75396f79b1a50d1efa8f1e0d8aab2221 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 21 Aug 2013 19:00:08 -0700
Subject: [PATCH] configure: fix action expansion

enable|disable -> (enable|disable)_feature

Change-Id: I7494913c78ebe8bb532fa6545e0ae53a79ccd388
---
 build/make/configure.sh | 4 ++--
 configure               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 52aea9d49..bb7ab4110 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -512,7 +512,7 @@ process_common_cmdline() {
           echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||
             die_unknown $opt
         fi
-        $action $option
+        ${action}_feature $option
         ;;
         --require-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
@@ -524,7 +524,7 @@ process_common_cmdline() {
         ;;
         --force-enable-?*|--force-disable-?*)
         eval `echo "$opt" | sed 's/--force-/action=/;s/-/ option=/;s/-/_/g'`
-        $action $option
+        ${action}_feature $option
         ;;
         --libc=*)
         [ -d "${optval}" ] || die "Not a directory: ${optval}"
diff --git a/configure b/configure
index 16326701b..a2520819e 100755
--- a/configure
+++ b/configure
@@ -363,7 +363,7 @@ process_cmdline() {
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         if echo "${EXPERIMENT_LIST}" | grep "^ *$option\$" >/dev/null; then
             if enabled experimental; then
-                $action $option
+                ${action}_feature $option
             else
                 log_echo "Ignoring $opt -- not in experimental mode."
             fi
-- 
2.40.0