generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'

Browse Source 
* commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6':
  configure: Use `require` for the non-component options

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

11
configure vendored
View File

@ -581,7 +581,7 @@ enable(){
check_requested() { check_requested() {
for var; do for var; do
eval test "x\$${var#!}_requested" = "xyes" && die "${var#*_} ${var/_*} cannot be enabled" eval test "x\$${var#!}_requested" = "xyes" && die "${var%%_*} cannot be enabled"
done done
} }
@ -641,7 +641,7 @@ enable_deep_weak(){
do_enable_deep_force(){ do_enable_deep_force(){
for var; do for var; do
enabled $var && continue enabled $var && continue
eval sel="\$${var}_select\ \$${var}_suggest\ \$${var}_select_any" eval sel="\$${var}_deps\ \$${var}_deps_any\ \$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
pushvar var pushvar var
enable_deep_force $sel enable_deep_force $sel
popvar var popvar var
@ -650,14 +650,18 @@ do_enable_deep_force(){
enable_deep_force(){ enable_deep_force(){
do_enable_deep_force $* do_enable_deep_force $*
enable $* for var; do
is_in $var $ALL_COMPONENTS $COMPONENT_LIST $LIBRARY_LIST && enable $var
done
} }
request(){ request(){
disable $* # force the refresh of the dependencies
for var; do for var; do
enable ${var}_requested enable ${var}_requested
done done
enable_deep_force $* enable_deep_force $*
enable $*
} }
enabled(){ enabled(){
@ -3260,6 +3264,7 @@ 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
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