diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-08 08:45:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-04-08 08:45:12 (GMT) |
| commit | a463bf5525ce6e43141d98abc3b996e0226b8fe0 (patch) | |
| tree | 375057fc538cd5e0845dc8b3f26c4b4478d74f70 /library | |
| parent | e5991250e0ed04102d22556452ad154fac8bf7d6 (diff) | |
| download | tcl-a463bf5525ce6e43141d98abc3b996e0226b8fe0.zip tcl-a463bf5525ce6e43141d98abc3b996e0226b8fe0.tar.gz tcl-a463bf5525ce6e43141d98abc3b996e0226b8fe0.tar.bz2 | |
Backport dde 1.4.4 from Tcl 8.7. Doesn't conflict with installed Tcl 9.0 version of dde any more.
(don't bother doing this for the "registry" extension, because the Tcl 8.7+ version installs in a different directory)
Diffstat (limited to 'library')
| -rw-r--r-- | library/dde/pkgIndex.tcl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index 1ca9c5a..18ac517 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -1,7 +1,12 @@ -if {![package vsatisfies [package provide Tcl] 8.5]} return if {[info sharedlibextension] != ".dll"} return -if {[::tcl::pkgconfig get debug]} { - package ifneeded dde 1.4.3 [list load [file join $dir tcldde14g.dll] Dde] +if {[package vsatisfies [package provide Tcl] 9.0-]} { + package ifneeded dde 1.4.4 \ + [list load [file join $dir tcl9dde14.dll] Dde] +} elseif {![package vsatisfies [package provide Tcl] 8.7] + && [::tcl::pkgconfig get debug]} { + package ifneeded dde 1.4.4 \ + [list load [file join $dir tcldde14g.dll] Dde] } else { - package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] Dde] + package ifneeded dde 1.4.4 \ + [list load [file join $dir tcldde14.dll] Dde] } |