Fossil SCM
Capture both SSL library requirements before attempting to build the code.
Commit
f517cb7f25c54ec431d3859cb4f83387bd919c41af3e3bd04b57393cc70aec02
Parent
0ef9501cfa0edd4…
1 file changed
+2
-1
M
auto.def
+2
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -376,11 +376,12 @@ | ||
| 376 | 376 | if {[string match *-darwin* [get-define host]]} { |
| 377 | 377 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 378 | 378 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | - if {[cc-check-function-in-lib BIO_ADDR_hostname_string ssl]} { | |
| 381 | + if {[cc-check-function-in-lib BIO_ADDR_hostname_string ssl] && \ | |
| 382 | + [cc-check-function-in-lib BIO_get_conn_address ssl]} { | |
| 382 | 383 | define HAVE_BIO_ADDR_HS 1 |
| 383 | 384 | msg-result "Using BIO_ADDR_hostname_string" |
| 384 | 385 | } |
| 385 | 386 | } else { |
| 386 | 387 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 387 | 388 |
| --- auto.def | |
| +++ auto.def | |
| @@ -376,11 +376,12 @@ | |
| 376 | if {[string match *-darwin* [get-define host]]} { |
| 377 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 378 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 379 | } |
| 380 | } |
| 381 | if {[cc-check-function-in-lib BIO_ADDR_hostname_string ssl]} { |
| 382 | define HAVE_BIO_ADDR_HS 1 |
| 383 | msg-result "Using BIO_ADDR_hostname_string" |
| 384 | } |
| 385 | } else { |
| 386 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 387 |
| --- auto.def | |
| +++ auto.def | |
| @@ -376,11 +376,12 @@ | |
| 376 | if {[string match *-darwin* [get-define host]]} { |
| 377 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 378 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 379 | } |
| 380 | } |
| 381 | if {[cc-check-function-in-lib BIO_ADDR_hostname_string ssl] && \ |
| 382 | [cc-check-function-in-lib BIO_get_conn_address ssl]} { |
| 383 | define HAVE_BIO_ADDR_HS 1 |
| 384 | msg-result "Using BIO_ADDR_hostname_string" |
| 385 | } |
| 386 | } else { |
| 387 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 388 |