diff options
author | Steve Bennett <steveb@workware.net.au> | 2017-09-17 19:58:37 +1000 |
---|---|---|
committer | Steve Bennett <steveb@workware.net.au> | 2017-09-21 16:32:04 +1000 |
commit | ca82a715e435685aa047f169c2896c3559d53828 (patch) | |
tree | f308c83b43dfd175415f07d8709a3a7d3eb30f97 /autosetup/local.tcl | |
parent | e1aa8a826c1976c2ad91002cb1396db3b506868c (diff) | |
download | jimtcl-ca82a715e435685aa047f169c2896c3559d53828.zip jimtcl-ca82a715e435685aa047f169c2896c3559d53828.tar.gz jimtcl-ca82a715e435685aa047f169c2896c3559d53828.tar.bz2 |
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 <steveb@workware.net.au>
Diffstat (limited to 'autosetup/local.tcl')
-rw-r--r-- | autosetup/local.tcl | 13 |
1 files changed, 9 insertions, 4 deletions
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 } } |