Fossil SCM
Use absolute path for the Tcl private stubs directory in 'configure'.
Commit
39f53e086ccbeda840a2d0b6bb4e65001d2dd1d6
Parent
ad6de6383391bd4…
1 file changed
+4
-3
M
auto.def
+4
-3
| --- auto.def | ||
| +++ auto.def | ||
| @@ -131,20 +131,21 @@ | ||
| 131 | 131 | set tclpath [opt-val with-tcl] |
| 132 | 132 | if {$tclpath ne ""} { |
| 133 | 133 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 134 | 134 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 135 | 135 | if {$tclpath eq "1"} { |
| 136 | + set tcldir [file join [file dirname $autosetup(dir)] compat/tcl-8.6] | |
| 136 | 137 | if {$tclprivatestubs} { |
| 137 | - set tclconfig(TCL_INCLUDE_SPEC) -Icompat/tcl-8.6/generic | |
| 138 | + set tclconfig(TCL_INCLUDE_SPEC) -I[file join $tcldir generic] | |
| 138 | 139 | set tclconfig(TCL_VERSION) {Private Stubs} |
| 139 | 140 | set tclconfig(TCL_PATCH_LEVEL) {} |
| 140 | - set tclconfig(TCL_PREFIX) {compat/tcl-8.6} | |
| 141 | + set tclconfig(TCL_PREFIX) $tcldir | |
| 141 | 142 | set tclconfig(TCL_LD_FLAGS) { } |
| 142 | 143 | } else { |
| 143 | 144 | # Use the system Tcl. Look in some likely places. |
| 144 | 145 | array set tclconfig [parse-tclconfig-sh \ |
| 145 | - compat/tcl-8.6/unix compat/tcl-8.6/win \ | |
| 146 | + [file join $tcldir unix] [file join $tcldir win] \ | |
| 146 | 147 | /usr /usr/local /usr/share /opt/local] |
| 147 | 148 | set msg "on your system" |
| 148 | 149 | } |
| 149 | 150 | } else { |
| 150 | 151 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 151 | 152 |
| --- auto.def | |
| +++ auto.def | |
| @@ -131,20 +131,21 @@ | |
| 131 | set tclpath [opt-val with-tcl] |
| 132 | if {$tclpath ne ""} { |
| 133 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 134 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 135 | if {$tclpath eq "1"} { |
| 136 | if {$tclprivatestubs} { |
| 137 | set tclconfig(TCL_INCLUDE_SPEC) -Icompat/tcl-8.6/generic |
| 138 | set tclconfig(TCL_VERSION) {Private Stubs} |
| 139 | set tclconfig(TCL_PATCH_LEVEL) {} |
| 140 | set tclconfig(TCL_PREFIX) {compat/tcl-8.6} |
| 141 | set tclconfig(TCL_LD_FLAGS) { } |
| 142 | } else { |
| 143 | # Use the system Tcl. Look in some likely places. |
| 144 | array set tclconfig [parse-tclconfig-sh \ |
| 145 | compat/tcl-8.6/unix compat/tcl-8.6/win \ |
| 146 | /usr /usr/local /usr/share /opt/local] |
| 147 | set msg "on your system" |
| 148 | } |
| 149 | } else { |
| 150 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 151 |
| --- auto.def | |
| +++ auto.def | |
| @@ -131,20 +131,21 @@ | |
| 131 | set tclpath [opt-val with-tcl] |
| 132 | if {$tclpath ne ""} { |
| 133 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 134 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 135 | if {$tclpath eq "1"} { |
| 136 | set tcldir [file join [file dirname $autosetup(dir)] compat/tcl-8.6] |
| 137 | if {$tclprivatestubs} { |
| 138 | set tclconfig(TCL_INCLUDE_SPEC) -I[file join $tcldir generic] |
| 139 | set tclconfig(TCL_VERSION) {Private Stubs} |
| 140 | set tclconfig(TCL_PATCH_LEVEL) {} |
| 141 | set tclconfig(TCL_PREFIX) $tcldir |
| 142 | set tclconfig(TCL_LD_FLAGS) { } |
| 143 | } else { |
| 144 | # Use the system Tcl. Look in some likely places. |
| 145 | array set tclconfig [parse-tclconfig-sh \ |
| 146 | [file join $tcldir unix] [file join $tcldir win] \ |
| 147 | /usr /usr/local /usr/share /opt/local] |
| 148 | set msg "on your system" |
| 149 | } |
| 150 | } else { |
| 151 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 152 |