Fossil SCM
Patch the auto.def file so that the TCL library is found even if it is named tcl8.6 or tcl8.5 instead of just tcl.
Commit
dd275844a5879a3eaa319ab890f3470d5a42489e
Parent
827a54fe6ca6cb2…
1 file changed
+10
-6
M
auto.def
+10
-6
| --- auto.def | ||
| +++ auto.def | ||
| @@ -85,19 +85,23 @@ | ||
| 85 | 85 | set tclpath [opt-val with-tcl] |
| 86 | 86 | if {$tclpath ne ""} { |
| 87 | 87 | if {$tclpath ne "1"} { |
| 88 | 88 | cc-with [list -cflags [list -I$tclpath/include -L$tclpath/lib]] |
| 89 | 89 | } |
| 90 | - if {![cc-check-includes tcl.h] || ![cc-check-function-in-lib Tcl_CreateInterp tcl]} { | |
| 91 | - if {$tclpath eq ""} { | |
| 92 | - user-error "No system Tcl available. Try --with-tcl=<path>" | |
| 93 | - } else { | |
| 94 | - user-error "No Tcl available at $tclpath" | |
| 90 | + if {![cc-check-includes tcl.h]} { | |
| 91 | + user-error "Cannot find tcl.h" | |
| 92 | + } | |
| 93 | + foreach tlib {tcl8.6 tcl8.5 tcl notfound} { | |
| 94 | + if {$tlib=="notfound"} { | |
| 95 | + user-error "Cannot find a usable libtcl" | |
| 96 | + } | |
| 97 | + if {[cc-check-function-in-lib Tcl_CreateInterp $tlib]} { | |
| 98 | + define-append LIBS -l$tlib | |
| 99 | + break | |
| 95 | 100 | } |
| 96 | 101 | } |
| 97 | 102 | define FOSSIL_ENABLE_TCL |
| 98 | - define-append LIBS -ltcl | |
| 99 | 103 | if {$tclpath ne "1"} { |
| 100 | 104 | define-append EXTRA_CFLAGS -I$tclpath/include |
| 101 | 105 | define-append EXTRA_LDFLAGS -L$tclpath/lib |
| 102 | 106 | } |
| 103 | 107 | } |
| 104 | 108 |
| --- auto.def | |
| +++ auto.def | |
| @@ -85,19 +85,23 @@ | |
| 85 | set tclpath [opt-val with-tcl] |
| 86 | if {$tclpath ne ""} { |
| 87 | if {$tclpath ne "1"} { |
| 88 | cc-with [list -cflags [list -I$tclpath/include -L$tclpath/lib]] |
| 89 | } |
| 90 | if {![cc-check-includes tcl.h] || ![cc-check-function-in-lib Tcl_CreateInterp tcl]} { |
| 91 | if {$tclpath eq ""} { |
| 92 | user-error "No system Tcl available. Try --with-tcl=<path>" |
| 93 | } else { |
| 94 | user-error "No Tcl available at $tclpath" |
| 95 | } |
| 96 | } |
| 97 | define FOSSIL_ENABLE_TCL |
| 98 | define-append LIBS -ltcl |
| 99 | if {$tclpath ne "1"} { |
| 100 | define-append EXTRA_CFLAGS -I$tclpath/include |
| 101 | define-append EXTRA_LDFLAGS -L$tclpath/lib |
| 102 | } |
| 103 | } |
| 104 |
| --- auto.def | |
| +++ auto.def | |
| @@ -85,19 +85,23 @@ | |
| 85 | set tclpath [opt-val with-tcl] |
| 86 | if {$tclpath ne ""} { |
| 87 | if {$tclpath ne "1"} { |
| 88 | cc-with [list -cflags [list -I$tclpath/include -L$tclpath/lib]] |
| 89 | } |
| 90 | if {![cc-check-includes tcl.h]} { |
| 91 | user-error "Cannot find tcl.h" |
| 92 | } |
| 93 | foreach tlib {tcl8.6 tcl8.5 tcl notfound} { |
| 94 | if {$tlib=="notfound"} { |
| 95 | user-error "Cannot find a usable libtcl" |
| 96 | } |
| 97 | if {[cc-check-function-in-lib Tcl_CreateInterp $tlib]} { |
| 98 | define-append LIBS -l$tlib |
| 99 | break |
| 100 | } |
| 101 | } |
| 102 | define FOSSIL_ENABLE_TCL |
| 103 | if {$tclpath ne "1"} { |
| 104 | define-append EXTRA_CFLAGS -I$tclpath/include |
| 105 | define-append EXTRA_LDFLAGS -L$tclpath/lib |
| 106 | } |
| 107 | } |
| 108 |