[FFmpeg-devel] [PATCH 2/4] Revert "Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'"

[Michael Niedermayer]

This reverts commit e8ebcb0034c5d4e5df8ff407a5c28d8c53823236, reversing
changes made to 3bff005be8ea213c23160ee0ac286634a80a10e1.
---
 configure |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 40821e1..6562e70 100755
--- a/configure
+++ b/configure
@@ -3047,7 +3047,10 @@ cpu="generic"
 intrinsics="none"
 
 # configurable options
+enable $PROGRAM_LIST
 enable $DOCUMENT_LIST
+enable $EXAMPLE_LIST
+enable $(filter_out avresample $LIBRARY_LIST)
 enable stripping
 
 enable asm
@@ -3235,7 +3238,6 @@ for opt do
         ;;
         --disable-everything)
             map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
-            enable_deep_force $EXAMPLE_LIST $(filter_out avresample $LIBRARY_LIST) $PROGRAM_LIST
         ;;
         --disable-all)
             map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
@@ -3262,11 +3264,10 @@ for opt do
         ;;
         --enable-?*|--disable-?*)
             eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
+            test $action = enable && action="request"
             if is_in $option $COMPONENT_LIST; then
-                test $action = enable && action="enable_deep_force"
                 eval $action \$$(toupper ${option%s})_LIST
             elif is_in $option $CMDLINE_SELECT; then
-                test $action = enable && action="request"
                 $action $option
             else
                 die_unknown $opt
@@ -3303,10 +3304,6 @@ done
 
 disabled logging && logfile=/dev/null
 
-# Enable the default components if not disabled explicitly
-
-enable_weak $EXAMPLE_LIST $(filter_out avresample $LIBRARY_LIST) $PROGRAM_LIST
-
 # Disable all the library-specific components if the library itself
 # is disabled, see AVCODEC_LIST and following _LIST variables.
 
-- 
1.7.9.5