Fossil SCM
When using private stubs, really use private stubs
Commit
07c8b730726d6b63536eeda3234363dfb572a4a0
Parent
02d3f53305aa1c6…
1 file changed
+14
-6
M
auto.def
+14
-6
| --- auto.def | ||
| +++ auto.def | ||
| @@ -102,26 +102,34 @@ | ||
| 102 | 102 | user-error "zlib not found please install it or specify the location with --with-zlib" |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | set tclpath [opt-val with-tcl] |
| 106 | 106 | if {$tclpath ne ""} { |
| 107 | + set tclprivatestubs [opt-bool with-tcl-private-stubs] | |
| 107 | 108 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 108 | 109 | if {$tclpath eq "1"} { |
| 109 | - # Use the system Tcl. Look in some likely places. | |
| 110 | - array set tclconfig [parse-tclconfig-sh \ | |
| 111 | - compat/tcl-8.6/unix compat/tcl-8.6/win \ | |
| 112 | - /usr /usr/local /usr/share /opt/local] | |
| 113 | - set msg "on your system" | |
| 110 | + if {$tclprivatestubs} { | |
| 111 | + set tclconfig(TCL_INCLUDE_SPEC) -Icompat/tcl-8.6/generic | |
| 112 | + set tclconfig(TCL_VERSION) {Private Stubs} | |
| 113 | + set tclconfig(TCL_PATCH_LEVEL) {} | |
| 114 | + set tclconfig(TCL_PREFIX) {compat/tcl-8.6} | |
| 115 | + set tclconfig(TCL_LD_FLAGS) { } | |
| 116 | + } else { | |
| 117 | + # Use the system Tcl. Look in some likely places. | |
| 118 | + array set tclconfig [parse-tclconfig-sh \ | |
| 119 | + compat/tcl-8.6/unix compat/tcl-8.6/win \ | |
| 120 | + /usr /usr/local /usr/share /opt/local] | |
| 121 | + set msg "on your system" | |
| 122 | + } | |
| 114 | 123 | } else { |
| 115 | 124 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 116 | 125 | set msg "at $tclpath" |
| 117 | 126 | } |
| 118 | 127 | if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} { |
| 119 | 128 | user-error "Cannot find Tcl $msg" |
| 120 | 129 | } |
| 121 | 130 | set tclstubs [opt-bool with-tcl-stubs] |
| 122 | - set tclprivatestubs [opt-bool with-tcl-private-stubs] | |
| 123 | 131 | if {$tclprivatestubs} { |
| 124 | 132 | define FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 125 | 133 | define USE_TCL_STUBS |
| 126 | 134 | } elseif {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} { |
| 127 | 135 | set libs "$tclconfig(TCL_STUB_LIB_SPEC)" |
| 128 | 136 |
| --- auto.def | |
| +++ auto.def | |
| @@ -102,26 +102,34 @@ | |
| 102 | user-error "zlib not found please install it or specify the location with --with-zlib" |
| 103 | } |
| 104 | |
| 105 | set tclpath [opt-val with-tcl] |
| 106 | if {$tclpath ne ""} { |
| 107 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 108 | if {$tclpath eq "1"} { |
| 109 | # Use the system Tcl. Look in some likely places. |
| 110 | array set tclconfig [parse-tclconfig-sh \ |
| 111 | compat/tcl-8.6/unix compat/tcl-8.6/win \ |
| 112 | /usr /usr/local /usr/share /opt/local] |
| 113 | set msg "on your system" |
| 114 | } else { |
| 115 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 116 | set msg "at $tclpath" |
| 117 | } |
| 118 | if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} { |
| 119 | user-error "Cannot find Tcl $msg" |
| 120 | } |
| 121 | set tclstubs [opt-bool with-tcl-stubs] |
| 122 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 123 | if {$tclprivatestubs} { |
| 124 | define FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 125 | define USE_TCL_STUBS |
| 126 | } elseif {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} { |
| 127 | set libs "$tclconfig(TCL_STUB_LIB_SPEC)" |
| 128 |
| --- auto.def | |
| +++ auto.def | |
| @@ -102,26 +102,34 @@ | |
| 102 | user-error "zlib not found please install it or specify the location with --with-zlib" |
| 103 | } |
| 104 | |
| 105 | set tclpath [opt-val with-tcl] |
| 106 | if {$tclpath ne ""} { |
| 107 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 108 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 109 | if {$tclpath eq "1"} { |
| 110 | if {$tclprivatestubs} { |
| 111 | set tclconfig(TCL_INCLUDE_SPEC) -Icompat/tcl-8.6/generic |
| 112 | set tclconfig(TCL_VERSION) {Private Stubs} |
| 113 | set tclconfig(TCL_PATCH_LEVEL) {} |
| 114 | set tclconfig(TCL_PREFIX) {compat/tcl-8.6} |
| 115 | set tclconfig(TCL_LD_FLAGS) { } |
| 116 | } else { |
| 117 | # Use the system Tcl. Look in some likely places. |
| 118 | array set tclconfig [parse-tclconfig-sh \ |
| 119 | compat/tcl-8.6/unix compat/tcl-8.6/win \ |
| 120 | /usr /usr/local /usr/share /opt/local] |
| 121 | set msg "on your system" |
| 122 | } |
| 123 | } else { |
| 124 | array set tclconfig [parse-tclconfig-sh $tclpath] |
| 125 | set msg "at $tclpath" |
| 126 | } |
| 127 | if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} { |
| 128 | user-error "Cannot find Tcl $msg" |
| 129 | } |
| 130 | set tclstubs [opt-bool with-tcl-stubs] |
| 131 | if {$tclprivatestubs} { |
| 132 | define FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 133 | define USE_TCL_STUBS |
| 134 | } elseif {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} { |
| 135 | set libs "$tclconfig(TCL_STUB_LIB_SPEC)" |
| 136 |