shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/build/make/configure.sh

+++ b/build/make/configure.sh

@@ -540,15 +540,13 @@

         ;;

       --enable-?*|--disable-?*)

         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} "

         elif [ $action = "disable" ] && ! disabled $option ; then

-          echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||

-            die_unknown $opt

+          is_in ${option} ${CMDLINE_SELECT} || die_unknown $opt

           log_echo "  disabling $option"

         elif [ $action = "enable" ] && ! enabled $option ; then

-          echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||

-            die_unknown $opt

+          is_in ${option} ${CMDLINE_SELECT} || die_unknown $opt

           log_echo "  enabling $option"

         fi

         ${action}_feature $option

@@ -555,7 +553,7 @@

         ;;

       --require-?*)

         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} "

         else

             die_unknown $opt

--- a/configure

+++ b/configure

@@ -396,7 +396,7 @@

           ;;

         --enable-?*|--disable-?*)

         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

                 ${action}_feature $option

             else