diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-08-08 20:30:37 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-08-08 20:30:37 (GMT) |
| commit | 23754cbbc81ac0eda71610fe3737a8bc8ae31c65 (patch) | |
| tree | a6fadf3d6bc55a704065f4543ea894d5ebddfe46 /library | |
| parent | ff0e2463cb108f9b0481ac516251142506818114 (diff) | |
| parent | 7ce9d6f8fc9b0c2b4fd1a18a85c54bb37387dda0 (diff) | |
| download | tcl-23754cbbc81ac0eda71610fe3737a8bc8ae31c65.zip tcl-23754cbbc81ac0eda71610fe3737a8bc8ae31c65.tar.gz tcl-23754cbbc81ac0eda71610fe3737a8bc8ae31c65.tar.bz2 | |
merge trunk
Diffstat (limited to 'library')
| -rw-r--r-- | library/dde/pkgIndex.tcl | 8 | ||||
| -rw-r--r-- | library/init.tcl | 15 | ||||
| -rwxr-xr-x | library/reg/pkgIndex.tcl | 4 |
3 files changed, 14 insertions, 13 deletions
diff --git a/library/dde/pkgIndex.tcl b/library/dde/pkgIndex.tcl index fef4f24..ce8276b 100644 --- a/library/dde/pkgIndex.tcl +++ b/library/dde/pkgIndex.tcl @@ -1,7 +1,7 @@ -if {![package vsatisfies [package provide Tcl] 8.5]} return -if {[info sharedlibextension] ne ".dll"} return +if {([info commands ::tcl::pkgconfig] eq "") + || ([info sharedlibextension] ne ".dll")} return if {[::tcl::pkgconfig get debug]} { - package ifneeded dde 1.4.0 [list load [file join $dir tcldde14g.dll] dde] + package ifneeded dde 1.4.0b1 [list load [file join $dir tcldde14g.dll] dde] } else { - package ifneeded dde 1.4.0 [list load [file join $dir tcldde14.dll] dde] + package ifneeded dde 1.4.0b1 [list load [file join $dir tcldde14.dll] dde] } diff --git a/library/init.tcl b/library/init.tcl index e4b14d2..3ec78af 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -689,13 +689,14 @@ proc auto_execok name { } } - foreach dir [split $path {;}] { - # Skip already checked directories - if {[info exists checked($dir)] || ($dir eq "")} { - continue - } - set checked($dir) {} - foreach ext $execExtensions { + foreach ext $execExtensions { + unset -nocomplain checked + foreach dir [split $path {;}] { + # Skip already checked directories + if {[info exists checked($dir)] || ($dir eq "")} { + continue + } + set checked($dir) {} set file [file join $dir ${name}${ext}] if {[file exists $file] && ![file isdirectory $file]} { return [set auto_execs($name) [list $file]] diff --git a/library/reg/pkgIndex.tcl b/library/reg/pkgIndex.tcl index f71b09f..55af4b3 100755 --- a/library/reg/pkgIndex.tcl +++ b/library/reg/pkgIndex.tcl @@ -1,5 +1,5 @@ -if {![package vsatisfies [package provide Tcl] 8.5]} return -if {[info sharedlibextension] ne ".dll"} return +if {([info commands ::tcl::pkgconfig] eq "") + || ([info sharedlibextension] ne ".dll")} return if {[::tcl::pkgconfig get debug]} { package ifneeded registry 1.3.0 \ [list load [file join $dir tclreg13g.dll] registry] |