summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-01-21 20:37:49 +0100
committerLuca Barbato <lu_zero@gentoo.org>2016-01-21 21:24:33 +0100
commite93aa2c9e7b3599aee6a5820760fc1a2c629dea0 (patch)
tree3ce727fdde3cd23466c3402a0646c106dede9509 /configure
parent65d29dd274a302131e2e4bc6d2b1eca4a093900c (diff)
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure19
1 files changed, 17 insertions, 2 deletions
diff --git a/configure b/configure
index 96ef9a4e11..1bfd3e9244 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(){