From e93aa2c9e7b3599aee6a5820760fc1a2c629dea0 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Thu, 21 Jan 2016 20:37:49 +0100
Subject: [PATCH] configure: Force-enable select_any dependencies only on
--enable
Unbreak --enable-gnutls enabling tls_openssl_protocol
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---
configure | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 96ef9a4e118..1bfd3e92442 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(){
--
GitLab