Fossil

Check-in [39f53e08]
Login

Check-in [39f53e08]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Use absolute path for the Tcl private stubs directory in 'configure'.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 39f53e086ccbeda840a2d0b6bb4e65001d2dd1d6
User & Date: mistachkin 2016-01-11 19:59:58
Context
2016-01-11
21:08
Skip test 'th1-tcl2' if the SQLite package for Tcl is not available. ... (check-in: 2fbbd4f6 user: mistachkin tags: trunk)
19:59
Use absolute path for the Tcl private stubs directory in 'configure'. ... (check-in: 39f53e08 user: mistachkin tags: trunk)
19:46
Prevent the 'array set' commands in the 'utf.test' file from causing problems if there are pre-existing scalar variables. ... (check-in: ad6de638 user: mistachkin tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to auto.def.
︙︙
129
130
131
132
133
134
135

136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152

}

set tclpath [opt-val with-tcl]
if {$tclpath ne ""} {
    set tclprivatestubs [opt-bool with-tcl-private-stubs]
    # Note parse-tclconfig-sh is in autosetup/local.tcl
    if {$tclpath eq "1"} {

        if {$tclprivatestubs} {
            set tclconfig(TCL_INCLUDE_SPEC) -Icompat/tcl-8.6/generic
            set tclconfig(TCL_VERSION) {Private Stubs}
            set tclconfig(TCL_PATCH_LEVEL) {}
            set tclconfig(TCL_PREFIX) {compat/tcl-8.6}
            set tclconfig(TCL_LD_FLAGS) { }
        } else {
            # Use the system Tcl. Look in some likely places.
            array set tclconfig [parse-tclconfig-sh \
                compat/tcl-8.6/unix compat/tcl-8.6/win \
                /usr /usr/local /usr/share /opt/local]
            set msg "on your system"
        }
    } else {
        array set tclconfig [parse-tclconfig-sh $tclpath]
        set msg "at $tclpath"
    }








>

|


|




|








129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153

}

set tclpath [opt-val with-tcl]
if {$tclpath ne ""} {
    set tclprivatestubs [opt-bool with-tcl-private-stubs]
    # Note parse-tclconfig-sh is in autosetup/local.tcl
    if {$tclpath eq "1"} {
        set tcldir [file join [file dirname $autosetup(dir)] compat/tcl-8.6]
        if {$tclprivatestubs} {
            set tclconfig(TCL_INCLUDE_SPEC) -I[file join $tcldir generic]
            set tclconfig(TCL_VERSION) {Private Stubs}
            set tclconfig(TCL_PATCH_LEVEL) {}
            set tclconfig(TCL_PREFIX) $tcldir
            set tclconfig(TCL_LD_FLAGS) { }
        } else {
            # Use the system Tcl. Look in some likely places.
            array set tclconfig [parse-tclconfig-sh \
                [file join $tcldir unix] [file join $tcldir win] \
                /usr /usr/local /usr/share /opt/local]
            set msg "on your system"
        }
    } else {
        array set tclconfig [parse-tclconfig-sh $tclpath]
        set msg "at $tclpath"
    }
︙︙