Fossil SCM
Move the configure check for -lm to before the check for openssl to avoid weirdness discussed in/around [forum:9430c163139f78ee|forum post 9430c163139f78ee].
Commit
04e2f6457d7d321c8f0ca7ca5c9780e14b48b6a2b1af3f187a7564dcc8bca7f4
Parent
d23f1ab44a98f87…
1 file changed
+3
-1
M
auto.def
+3
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -337,10 +337,13 @@ | ||
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | # Check for libraries that need to be sorted out early |
| 340 | 340 | cc-check-function-in-lib iconv iconv |
| 341 | 341 | |
| 342 | +cc-check-function-in-lib sin m ;# must come before ssl check: | |
| 343 | + # https://fossil-scm.org/forum/forumpost/afcd42b7fd | |
| 344 | + | |
| 342 | 345 | # Helper for OpenSSL checking |
| 343 | 346 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto -lpthread}}} { |
| 344 | 347 | msg-checking "Checking for $msg..." |
| 345 | 348 | set rc 0 |
| 346 | 349 | if {[is_mingw]} { |
| @@ -771,11 +774,10 @@ | ||
| 771 | 774 | # Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars |
| 772 | 775 | if {![cc-check-functions getpassphrase]} { |
| 773 | 776 | # Haiku needs this |
| 774 | 777 | cc-check-function-in-lib getpass bsd |
| 775 | 778 | } |
| 776 | -cc-check-function-in-lib sin m | |
| 777 | 779 | |
| 778 | 780 | # Check for the FuseFS library |
| 779 | 781 | if {[opt-bool fusefs]} { |
| 780 | 782 | if {[opt-bool static]} { |
| 781 | 783 | msg-result "FuseFS support disabled due to -static" |
| 782 | 784 |
| --- auto.def | |
| +++ auto.def | |
| @@ -337,10 +337,13 @@ | |
| 337 | } |
| 338 | |
| 339 | # Check for libraries that need to be sorted out early |
| 340 | cc-check-function-in-lib iconv iconv |
| 341 | |
| 342 | # Helper for OpenSSL checking |
| 343 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto -lpthread}}} { |
| 344 | msg-checking "Checking for $msg..." |
| 345 | set rc 0 |
| 346 | if {[is_mingw]} { |
| @@ -771,11 +774,10 @@ | |
| 771 | # Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars |
| 772 | if {![cc-check-functions getpassphrase]} { |
| 773 | # Haiku needs this |
| 774 | cc-check-function-in-lib getpass bsd |
| 775 | } |
| 776 | cc-check-function-in-lib sin m |
| 777 | |
| 778 | # Check for the FuseFS library |
| 779 | if {[opt-bool fusefs]} { |
| 780 | if {[opt-bool static]} { |
| 781 | msg-result "FuseFS support disabled due to -static" |
| 782 |
| --- auto.def | |
| +++ auto.def | |
| @@ -337,10 +337,13 @@ | |
| 337 | } |
| 338 | |
| 339 | # Check for libraries that need to be sorted out early |
| 340 | cc-check-function-in-lib iconv iconv |
| 341 | |
| 342 | cc-check-function-in-lib sin m ;# must come before ssl check: |
| 343 | # https://fossil-scm.org/forum/forumpost/afcd42b7fd |
| 344 | |
| 345 | # Helper for OpenSSL checking |
| 346 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto -lpthread}}} { |
| 347 | msg-checking "Checking for $msg..." |
| 348 | set rc 0 |
| 349 | if {[is_mingw]} { |
| @@ -771,11 +774,10 @@ | |
| 774 | # Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars |
| 775 | if {![cc-check-functions getpassphrase]} { |
| 776 | # Haiku needs this |
| 777 | cc-check-function-in-lib getpass bsd |
| 778 | } |
| 779 | |
| 780 | # Check for the FuseFS library |
| 781 | if {[opt-bool fusefs]} { |
| 782 | if {[opt-bool static]} { |
| 783 | msg-result "FuseFS support disabled due to -static" |
| 784 |