Commit e8ebcb00 authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit 'a2bb771a'

* commit 'a2bb771a':
  configure: Restore the --enable-everything behaviour
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 3bff005b a2bb771a
......@@ -3047,10 +3047,7 @@ 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
......@@ -3238,6 +3235,7 @@ 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
......@@ -3264,10 +3262,11 @@ 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
......@@ -3304,6 +3303,10 @@ 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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment