This reverts commit 470bfab470893d45328f4e6e25d60b89c9af1abe, reversing
changes made to f97ee815cf25580cbb9d6bed304d9c22895f7074.
---
configure | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 6562e70..8e673b6 100755
--- a/configure
+++ b/configure
@@ -581,7 +581,7 @@ enable(){
check_requested() {
for var; do
- eval test "x\$${var#!}_requested" = "xyes" && die "${var%%_*} cannot
be enabled"
+ eval test "x\$${var#!}_requested" = "xyes" && die "${var#*_}
${var/_*} cannot be enabled"
done
}
@@ -641,7 +641,7 @@ enable_deep_weak(){
do_enable_deep_force(){
for var; do
enabled $var && continue
- eval sel="\$${var}_deps\ \$${var}_deps_any\ \$${var}_select\
\$${var}_suggest\ \$${var}_select_any"
+ eval sel="\$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
pushvar var
enable_deep_force $sel
popvar var
@@ -650,18 +650,14 @@ do_enable_deep_force(){
enable_deep_force(){
do_enable_deep_force $*
- for var; do
- is_in $var $ALL_COMPONENTS $COMPONENT_LIST $LIBRARY_LIST && enable $var
- done
+ enable $*
}
request(){
- disable $* # force the refresh of the dependencies
for var; do
enable ${var}_requested
done
enable_deep_force $*
- enable $*
}
enabled(){
@@ -3264,7 +3260,6 @@ 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
eval $action \$$(toupper ${option%s})_LIST
elif is_in $option $CMDLINE_SELECT; then
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
