har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'

Browse Source 
* commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22':
  configure: Restore the --enable-everything behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-17 15:39:27 +00:00
commit e8ebcb0034
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

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