Fossil SCM
Moved the check for iconv(3) in -liconv up within auto.def. If it happens after the checks for OpenSSL on certain macOS configurations, autosetup can be fooled into believing it doesn't need -liconv on that platform. This checkin splits up the group of cc-check-functions calls, so the moved call is now documented as to why its segregated.
Commit
e6f64f5eeb12a2780fb91059d048ce18870c8d031067bde503151fe69988e096
Parent
669cd4041b89333…
1 file changed
+3
-1
M
auto.def
+3
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -190,10 +190,13 @@ | ||
| 190 | 190 | } else { |
| 191 | 191 | define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1 |
| 192 | 192 | define FOSSIL_DYNAMIC_BUILD |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | +# Check for libraries that need to be sorted out early | |
| 196 | +cc-check-function-in-lib iconv iconv | |
| 197 | + | |
| 195 | 198 | # Helper for OpenSSL checking |
| 196 | 199 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} { |
| 197 | 200 | msg-checking "Checking for $msg..." |
| 198 | 201 | set rc 0 |
| 199 | 202 | if {[is_mingw]} { |
| @@ -458,11 +461,10 @@ | ||
| 458 | 461 | # Last resort, may be Windows |
| 459 | 462 | if {[is_mingw]} { |
| 460 | 463 | define-append LIBS -lwsock32 |
| 461 | 464 | } |
| 462 | 465 | } |
| 463 | -cc-check-function-in-lib iconv iconv | |
| 464 | 466 | cc-check-functions utime |
| 465 | 467 | cc-check-functions usleep |
| 466 | 468 | cc-check-functions strchrnul |
| 467 | 469 | |
| 468 | 470 | # Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE |
| 469 | 471 |
| --- auto.def | |
| +++ auto.def | |
| @@ -190,10 +190,13 @@ | |
| 190 | } else { |
| 191 | define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1 |
| 192 | define FOSSIL_DYNAMIC_BUILD |
| 193 | } |
| 194 | |
| 195 | # Helper for OpenSSL checking |
| 196 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} { |
| 197 | msg-checking "Checking for $msg..." |
| 198 | set rc 0 |
| 199 | if {[is_mingw]} { |
| @@ -458,11 +461,10 @@ | |
| 458 | # Last resort, may be Windows |
| 459 | if {[is_mingw]} { |
| 460 | define-append LIBS -lwsock32 |
| 461 | } |
| 462 | } |
| 463 | cc-check-function-in-lib iconv iconv |
| 464 | cc-check-functions utime |
| 465 | cc-check-functions usleep |
| 466 | cc-check-functions strchrnul |
| 467 | |
| 468 | # Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE |
| 469 |
| --- auto.def | |
| +++ auto.def | |
| @@ -190,10 +190,13 @@ | |
| 190 | } else { |
| 191 | define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1 |
| 192 | define FOSSIL_DYNAMIC_BUILD |
| 193 | } |
| 194 | |
| 195 | # Check for libraries that need to be sorted out early |
| 196 | cc-check-function-in-lib iconv iconv |
| 197 | |
| 198 | # Helper for OpenSSL checking |
| 199 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} { |
| 200 | msg-checking "Checking for $msg..." |
| 201 | set rc 0 |
| 202 | if {[is_mingw]} { |
| @@ -458,11 +461,10 @@ | |
| 461 | # Last resort, may be Windows |
| 462 | if {[is_mingw]} { |
| 463 | define-append LIBS -lwsock32 |
| 464 | } |
| 465 | } |
| 466 | cc-check-functions utime |
| 467 | cc-check-functions usleep |
| 468 | cc-check-functions strchrnul |
| 469 | |
| 470 | # Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE |
| 471 |