summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-16 08:09:59 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-16 08:09:59 (GMT)
commit5dff38707576522b97793ce6ad8024b0f92895bb (patch)
tree0bf01c8623d94ff15405801f2a2d6361b947ae73
parent9d0855d10ef55854d4c108d76311090ac35d8bfc (diff)
downloadtcl-5dff38707576522b97793ce6ad8024b0f92895bb.zip
tcl-5dff38707576522b97793ce6ad8024b0f92895bb.tar.gz
tcl-5dff38707576522b97793ce6ad8024b0f92895bb.tar.bz2
Make registry 1.3 package dynamically loadable when ::tcl::pkgconfig is available
-rw-r--r--ChangeLog5
-rwxr-xr-xlibrary/reg/pkgIndex.tcl4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e5c2dc7..198756f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * library/reg/pkgIndex.tcl: Make registry 1.3 package dynamically
+ loadable in Tcl 8.4.20.
+
2012-07-11 Jan Nijtmans <nijtmans@users.sf.net>
* win/tclWinReg.c: [Bug #3362446]: registry keys command fails
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]