]>
Commit | Line | Data |
---|---|---|
5d58c208 MT |
1 | diff -up tcl8.5.7/library/auto.tcl.old tcl8.5.7/library/auto.tcl |
2 | --- tcl8.5.7/library/auto.tcl.old 2006-11-03 01:34:52.000000000 +0100 | |
3 | +++ tcl8.5.7/library/auto.tcl 2009-05-18 10:28:16.337102378 +0200 | |
85e9e990 SS |
4 | @@ -85,6 +85,13 @@ proc tcl_findLibrary {basename version p |
5 | lappend dirs $value | |
6 | } | |
7 | ||
8 | + # 2a. As a sibling of Tcl's script directory | |
9 | + if {[catch { | |
10 | + ::tcl::pkgconfig get scriptdir,runtime | |
11 | + } value] == 0} { | |
12 | + lappend dirs [file join [file dirname $value] $basename$version] | |
13 | + } | |
14 | + | |
15 | # 3. Relative to auto_path directories. This checks relative to the | |
16 | # Tcl library as well as allowing loading of libraries added to the | |
17 | # auto_path that is not relative to the core library or binary paths. | |
5d58c208 MT |
18 | diff -up tcl8.5.7/library/init.tcl.old tcl8.5.7/library/init.tcl |
19 | --- tcl8.5.7/library/init.tcl.old 2009-04-10 18:54:51.000000000 +0200 | |
20 | +++ tcl8.5.7/library/init.tcl 2009-05-18 10:25:25.904853164 +0200 | |
85e9e990 SS |
21 | @@ -48,16 +48,11 @@ if {![info exists auto_path]} { |
22 | } | |
23 | namespace eval tcl { | |
24 | variable Dir | |
25 | - foreach Dir [list $::tcl_library [file dirname $::tcl_library]] { | |
26 | + foreach Dir [list $::tcl_library] { | |
27 | if {$Dir ni $::auto_path} { | |
28 | lappend ::auto_path $Dir | |
29 | } | |
30 | } | |
31 | - set Dir [file join [file dirname [file dirname \ | |
32 | - [info nameofexecutable]]] lib] | |
33 | - if {$Dir ni $::auto_path} { | |
34 | - lappend ::auto_path $Dir | |
35 | - } | |
36 | catch { | |
37 | foreach Dir $::tcl_pkgPath { | |
38 | if {$Dir ni $::auto_path} { | |
5d58c208 MT |
39 | diff -up tcl8.5.7/unix/configure.in.old tcl8.5.7/unix/configure.in |
40 | --- tcl8.5.7/unix/configure.in.old 2009-04-15 21:30:05.000000000 +0200 | |
41 | +++ tcl8.5.7/unix/configure.in 2009-05-18 10:21:30.987855050 +0200 | |
85e9e990 SS |
42 | @@ -833,9 +833,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then |
43 | test -z "$TCL_MODULE_PATH" && \ | |
44 | TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" | |
45 | elif test "$prefix/lib" != "$libdir"; then | |
46 | - TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" | |
5d58c208 | 47 | + TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}" |
85e9e990 SS |
48 | else |
49 | - TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" | |
5d58c208 | 50 | + TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}" |
85e9e990 SS |
51 | fi |
52 | ||
53 | #-------------------------------------------------------------------- |