[FFmpeg-cvslog] configure: Force-enable select_any dependencies only on --enable

Luca Barbato git at videolan.org
Wed Jan 27 20:53:11 CET 2016


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Thu Jan 21 20:37:49 2016 +0100| [e93aa2c9e7b3599aee6a5820760fc1a2c629dea0] | committer: Luca Barbato

configure: Force-enable select_any dependencies only on --enable

Unbreak --enable-gnutls enabling tls_openssl_protocol

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e93aa2c9e7b3599aee6a5820760fc1a2c629dea0
---

 configure |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 96ef9a4..1bfd3e9 100755
--- a/configure
+++ b/configure
@@ -521,7 +521,7 @@ disable_safe(){
 do_enable_deep(){
     for var; do
         enabled $var && continue
-        eval sel="\$${var}_select\ \$${var}_select_any"
+        eval sel="\$${var}_select"
         eval sgs="\$${var}_suggest"
         pushvar var sgs
         enable_deep $sel
@@ -546,11 +546,26 @@ enable_deep_weak(){
     done
 }
 
+do_enable_deep_force(){
+    for var; do
+        enabled $var && continue
+        eval sel="\$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
+        pushvar var
+        enable_deep_force $sel
+        popvar var
+    done
+}
+
+enable_deep_force(){
+    do_enable_deep_force $*
+    enable $*
+}
+
 request(){
     for var; do
         enable ${var}_requested
     done
-    enable_deep $*
+    enable_deep_force $*
 }
 
 enabled(){



More information about the ffmpeg-cvslog mailing list