Fossil SCM
In auto.def, set CFLAGS and LDFLAGS with LIBs as further tests may need them.
Commit
adcbb252560eef2c48ab270423ad924a6573af17569524211051038347e77b38
Parent
cb283ca505ade74…
1 file changed
+3
M
auto.def
+3
| --- auto.def | ||
| +++ auto.def | ||
| @@ -455,10 +455,12 @@ | ||
| 455 | 455 | } |
| 456 | 456 | if {$found} { |
| 457 | 457 | define FOSSIL_ENABLE_SSL |
| 458 | 458 | define-append EXTRA_CFLAGS $cflags |
| 459 | 459 | define-append EXTRA_LDFLAGS $ldflags |
| 460 | + define-append CFLAGS $cflags | |
| 461 | + define-append LDFLAGS $ldflags | |
| 460 | 462 | if {[info exists ssllibs]} { |
| 461 | 463 | define-append LIBS $ssllibs |
| 462 | 464 | } else { |
| 463 | 465 | define-append LIBS -lssl -lcrypto |
| 464 | 466 | } |
| @@ -655,10 +657,11 @@ | ||
| 655 | 657 | msg-result "Found Tcl $version at $tclconfig(TCL_PREFIX)" |
| 656 | 658 | if {!$tclprivatestubs} { |
| 657 | 659 | define-append LIBS $libs |
| 658 | 660 | } |
| 659 | 661 | define-append EXTRA_CFLAGS $cflags |
| 662 | + define-append CFLAGS $cflags | |
| 660 | 663 | if {[info exists zlibpath] && $zlibpath eq "tree"} { |
| 661 | 664 | # |
| 662 | 665 | # NOTE: When using zlib in the source tree, prevent Tcl from |
| 663 | 666 | # pulling in the system one. |
| 664 | 667 | # |
| 665 | 668 |
| --- auto.def | |
| +++ auto.def | |
| @@ -455,10 +455,12 @@ | |
| 455 | } |
| 456 | if {$found} { |
| 457 | define FOSSIL_ENABLE_SSL |
| 458 | define-append EXTRA_CFLAGS $cflags |
| 459 | define-append EXTRA_LDFLAGS $ldflags |
| 460 | if {[info exists ssllibs]} { |
| 461 | define-append LIBS $ssllibs |
| 462 | } else { |
| 463 | define-append LIBS -lssl -lcrypto |
| 464 | } |
| @@ -655,10 +657,11 @@ | |
| 655 | msg-result "Found Tcl $version at $tclconfig(TCL_PREFIX)" |
| 656 | if {!$tclprivatestubs} { |
| 657 | define-append LIBS $libs |
| 658 | } |
| 659 | define-append EXTRA_CFLAGS $cflags |
| 660 | if {[info exists zlibpath] && $zlibpath eq "tree"} { |
| 661 | # |
| 662 | # NOTE: When using zlib in the source tree, prevent Tcl from |
| 663 | # pulling in the system one. |
| 664 | # |
| 665 |
| --- auto.def | |
| +++ auto.def | |
| @@ -455,10 +455,12 @@ | |
| 455 | } |
| 456 | if {$found} { |
| 457 | define FOSSIL_ENABLE_SSL |
| 458 | define-append EXTRA_CFLAGS $cflags |
| 459 | define-append EXTRA_LDFLAGS $ldflags |
| 460 | define-append CFLAGS $cflags |
| 461 | define-append LDFLAGS $ldflags |
| 462 | if {[info exists ssllibs]} { |
| 463 | define-append LIBS $ssllibs |
| 464 | } else { |
| 465 | define-append LIBS -lssl -lcrypto |
| 466 | } |
| @@ -655,10 +657,11 @@ | |
| 657 | msg-result "Found Tcl $version at $tclconfig(TCL_PREFIX)" |
| 658 | if {!$tclprivatestubs} { |
| 659 | define-append LIBS $libs |
| 660 | } |
| 661 | define-append EXTRA_CFLAGS $cflags |
| 662 | define-append CFLAGS $cflags |
| 663 | if {[info exists zlibpath] && $zlibpath eq "tree"} { |
| 664 | # |
| 665 | # NOTE: When using zlib in the source tree, prevent Tcl from |
| 666 | # pulling in the system one. |
| 667 | # |
| 668 |