Fossil

Check-in [653b6b92]
Login

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

Overview
Comment:Simplify and enhance changes from the previous check-in.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 653b6b92404c53f31aa30653e9b03e4ac0087066
User & Date: mistachkin 2015-11-03 03:47:54
Context
2015-11-04
23:42
Make the --with-tcl configure option able to cope with systems where using '-lieee' from TCL_LIB_SPEC appears to cause issues. check-in: 7a0d543a user: mistachkin tags: branch-1.34
2015-11-03
13:49
Updates to the "fossil clean" command: Added the -i/--prompt option. Always report if unable to delete a file. Fixed memory leaks and over-length source code lines. check-in: c985d905 user: drh tags: trunk
04:47
merge trunk check-in: 23024b4a user: jan.nijtmans tags: cleanX
03:47
Simplify and enhance changes from the previous check-in. check-in: 653b6b92 user: mistachkin tags: trunk
03:36
Make the --with-tcl configure option able to cope with systems where using '-lieee' from TCL_LIB_SPEC appears to cause issues. check-in: cbe4af9e user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to auto.def.

162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
        define FOSSIL_ENABLE_TCL_STUBS
        define USE_TCL_STUBS
    } else {
        set libs "$tclconfig(TCL_LIB_SPEC) $tclconfig(TCL_LIBS)"
    }
    set cflags $tclconfig(TCL_INCLUDE_SPEC)
    if {!$tclprivatestubs} {
        set libtclfailcount 0
        cc-with [list -cflags $cflags -libs $libs] {
            if {$tclstubs} {
                if {![cc-check-functions Tcl_InitStubs]} {
                    incr libtclfailcount
                }
            } else {
                if {![cc-check-functions Tcl_CreateInterp]} {
                    incr libtclfailcount
                }
            }
        }
        if {$libtclfailcount >= 1} {
            # On some systems, using "-lieee" from TCL_LIB_SPEC appears
            # to cause issues.
            msg-result "Removing \"-lieee\" and retrying for Tcl..."
            set libs [string map [list -lieee ""] $libs]
            cc-with [list -cflags $cflags -libs $libs] {
                if {$tclstubs} {
                    if {![cc-check-functions Tcl_InitStubs]} {
                        incr libtclfailcount
                    }
                } else {
                    if {![cc-check-functions Tcl_CreateInterp]} {
                        incr libtclfailcount
                    }
                }
            }
        }
        if {$libtclfailcount >= 2} {
            if {$tclstubs} {
                user-error "Cannot find a usable Tcl stubs library $msg"
            } else {
                user-error "Cannot find a usable Tcl library $msg"
            }
        }
    }







|


|
|


|
|



|






|
|


|
|




|







162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
        define FOSSIL_ENABLE_TCL_STUBS
        define USE_TCL_STUBS
    } else {
        set libs "$tclconfig(TCL_LIB_SPEC) $tclconfig(TCL_LIBS)"
    }
    set cflags $tclconfig(TCL_INCLUDE_SPEC)
    if {!$tclprivatestubs} {
        set foundtcl 0; # Did we find a working Tcl library?
        cc-with [list -cflags $cflags -libs $libs] {
            if {$tclstubs} {
                if {[cc-check-functions Tcl_InitStubs]} {
                    set foundtcl 1
                }
            } else {
                if {[cc-check-functions Tcl_CreateInterp]} {
                    set foundtcl 1
                }
            }
        }
        if {!$foundtcl && [string match *-lieee* $libs]} {
            # On some systems, using "-lieee" from TCL_LIB_SPEC appears
            # to cause issues.
            msg-result "Removing \"-lieee\" and retrying for Tcl..."
            set libs [string map [list -lieee ""] $libs]
            cc-with [list -cflags $cflags -libs $libs] {
                if {$tclstubs} {
                    if {[cc-check-functions Tcl_InitStubs]} {
                        set foundtcl 1
                    }
                } else {
                    if {[cc-check-functions Tcl_CreateInterp]} {
                        set foundtcl 1
                    }
                }
            }
        }
        if {!$foundtcl} {
            if {$tclstubs} {
                user-error "Cannot find a usable Tcl stubs library $msg"
            } else {
                user-error "Cannot find a usable Tcl library $msg"
            }
        }
    }