---

To be squashed with the previous, brought in for additional clarity.

 configure | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 92f68a2..cf01d81 100755
--- a/configure
+++ b/configure
@@ -487,8 +487,15 @@ enable(){
     set_all yes $*
 }

+check_requested() {
+    for var; do
+        eval test "x\$${var#!}_requested" = "xyes" && die "${var} cannot be 
enabled"
+    done
+}
+
 disable(){
     set_all no $*
+    check_requested $*
 }

 enable_weak(){
@@ -539,6 +546,13 @@ enable_deep_weak(){
     done
 }

+request(){
+    for var; do
+        enable ${var}_requested
+    done
+    enable_deep $*
+}
+
 enabled(){
     test "${1#!}" = "$1" && op== || op=!=
     eval test "x\$${1#!}" $op "xyes"
@@ -2610,7 +2624,7 @@ for opt do
             is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt"
             eval list=\$$(toupper $thing)_LIST
             name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing}
-            test $action = enable && action="enable_deep"
+            test $action = enable && action="request"
             $action $(filter "$name" $list)
         ;;
         --enable-avserver|--disable-avserver*)
--
2.6.1

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to