From ca82a715e435685aa047f169c2896c3559d53828 Mon Sep 17 00:00:00 2001 From: Steve Bennett Date: Sun, 17 Sep 2017 19:58:37 +1000 Subject: configure: Improve module selection Modules/extensions are now explicitly marked as optional (and enabled with --full), or off (must be explicitly enabled with --with-mod/--with-ext) This means that now binary and tclprefix are correctly not enabled by default, and zlib is enabled with --full. Signed-off-by: Steve Bennett --- autosetup/local.tcl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'autosetup') diff --git a/autosetup/local.tcl b/autosetup/local.tcl index e9e5a1d..9517b27 100644 --- a/autosetup/local.tcl +++ b/autosetup/local.tcl @@ -180,15 +180,20 @@ proc check-extensions {} { set withinfo(maybe) {} # Now work out the default status. We have. - # normal case, include !optional if possible - # --without=default, don't include optional + # normal case, include !off, !optional if possible + # --full, include !off if possible + # --without=default, don't include optional or off if {$withinfo(nodefault)} { lappend withinfo(maybe) stdlib } else { foreach i $extlist { - if {![ext-has $i optional]} { - lappend withinfo(maybe) $i + if {[ext-has $i off]} { + continue } + if {[ext-has $i optional] && !$withinfo(optional)} { + continue + } + lappend withinfo(maybe) $i } } -- cgit v1.1