|
 |
ae5dd1 |
diff -up tcl8.5.7/library/auto.tcl.old tcl8.5.7/library/auto.tcl
|
|
|
ae5dd1 |
--- tcl8.5.7/library/auto.tcl.old 2006-11-03 01:34:52.000000000 +0100
|
|
|
ae5dd1 |
+++ tcl8.5.7/library/auto.tcl 2009-05-18 10:28:16.337102378 +0200
|
|
|
ae5dd1 |
@@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p
|
|
|
ae5dd1 |
lappend dirs $value
|
|
|
ae5dd1 |
}
|
|
|
ae5dd1 |
|
|
|
ae5dd1 |
+ # 2a. As a sibling of Tcl's script directory
|
|
|
ae5dd1 |
+ if {[catch {
|
|
|
ae5dd1 |
+ ::tcl::pkgconfig get scriptdir,runtime
|
|
|
ae5dd1 |
+ } value] == 0} {
|
|
|
ae5dd1 |
+ lappend dirs [file join [file dirname $value] $basename$version]
|
|
|
ae5dd1 |
+ }
|
|
|
ae5dd1 |
+
|
|
|
ae5dd1 |
# 3. Relative to auto_path directories. This checks relative to the
|
|
|
ae5dd1 |
# Tcl library as well as allowing loading of libraries added to the
|
|
|
ae5dd1 |
# auto_path that is not relative to the core library or binary paths.
|
|
|
ae5dd1 |
diff -up tcl8.5.7/library/init.tcl.old tcl8.5.7/library/init.tcl
|
|
|
ae5dd1 |
--- tcl8.5.7/library/init.tcl.old 2009-04-10 18:54:51.000000000 +0200
|
|
|
ae5dd1 |
+++ tcl8.5.7/library/init.tcl 2009-05-18 10:25:25.904853164 +0200
|
|
|
ae5dd1 |
@@ -48,16 +48,11 @@ if {![info exists auto_path]} {
|
|
|
ae5dd1 |
}
|
|
|
ae5dd1 |
namespace eval tcl {
|
|
|
ae5dd1 |
variable Dir
|
|
|
ae5dd1 |
- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
|
|
|
ae5dd1 |
+ foreach Dir [list $::tcl_library] {
|
|
|
ae5dd1 |
if {$Dir ni $::auto_path} {
|
|
|
ae5dd1 |
lappend ::auto_path $Dir
|
|
|
ae5dd1 |
}
|
|
|
ae5dd1 |
}
|
|
|
ae5dd1 |
- set Dir [file join [file dirname [file dirname \
|
|
|
ae5dd1 |
- [info nameofexecutable]]] lib]
|
|
|
ae5dd1 |
- if {$Dir ni $::auto_path} {
|
|
|
ae5dd1 |
- lappend ::auto_path $Dir
|
|
|
ae5dd1 |
- }
|
|
|
ae5dd1 |
catch {
|
|
|
ae5dd1 |
foreach Dir $::tcl_pkgPath {
|
|
|
ae5dd1 |
if {$Dir ni $::auto_path} {
|
|
|
ae5dd1 |
diff -up tcl8.5.7/unix/configure.in.old tcl8.5.7/unix/configure.in
|
|
|
ae5dd1 |
--- tcl8.5.7/unix/configure.in.old 2009-04-15 21:30:05.000000000 +0200
|
|
|
ae5dd1 |
+++ tcl8.5.7/unix/configure.in 2009-05-18 10:21:30.987855050 +0200
|
|
|
ae5dd1 |
@@ -833,9 +833,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
|
|
|
ae5dd1 |
test -z "$TCL_MODULE_PATH" && \
|
|
|
ae5dd1 |
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
|
|
|
ae5dd1 |
elif test "$prefix/lib" != "$libdir"; then
|
|
|
ae5dd1 |
- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
|
|
|
ae5dd1 |
+ TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
|
|
|
ae5dd1 |
else
|
|
|
ae5dd1 |
- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
|
|
|
ae5dd1 |
+ TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
|
|
|
ae5dd1 |
fi
|
|
|
ae5dd1 |
|
|
|
ae5dd1 |
#--------------------------------------------------------------------
|