Fossil SCM
Fix ./configure so that the --with-openssl=tree option works better.
Commit
19f11a8dec591f4b42c31cbda70be19386d3b6446cc1815df9435ed467acae76
Parent
f7c869b9fb7b768…
1 file changed
+2
-2
M
auto.def
+2
-2
| --- auto.def | ||
| +++ auto.def | ||
| @@ -273,11 +273,11 @@ | ||
| 273 | 273 | |
| 274 | 274 | # Check for libraries that need to be sorted out early |
| 275 | 275 | cc-check-function-in-lib iconv iconv |
| 276 | 276 | |
| 277 | 277 | # Helper for OpenSSL checking |
| 278 | -proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} { | |
| 278 | +proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto -lpthread}}} { | |
| 279 | 279 | msg-checking "Checking for $msg..." |
| 280 | 280 | set rc 0 |
| 281 | 281 | if {[is_mingw]} { |
| 282 | 282 | lappend libs -lgdi32 -lwsock32 -lcrypt32 |
| 283 | 283 | } |
| @@ -351,11 +351,11 @@ | ||
| 351 | 351 | user-error "The OpenSSL in source tree directory does not exist" |
| 352 | 352 | } |
| 353 | 353 | set msg "ssl in $ssldir" |
| 354 | 354 | set cflags "-I$ssldir/include" |
| 355 | 355 | set ldflags "-L$ssldir" |
| 356 | - set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a" | |
| 356 | + set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a -lpthread" | |
| 357 | 357 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs] |
| 358 | 358 | } else { |
| 359 | 359 | if {$ssldirs in {auto ""}} { |
| 360 | 360 | catch { |
| 361 | 361 | set cflags [exec pkg-config openssl --cflags-only-I] |
| 362 | 362 |
| --- auto.def | |
| +++ auto.def | |
| @@ -273,11 +273,11 @@ | |
| 273 | |
| 274 | # Check for libraries that need to be sorted out early |
| 275 | cc-check-function-in-lib iconv iconv |
| 276 | |
| 277 | # Helper for OpenSSL checking |
| 278 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} { |
| 279 | msg-checking "Checking for $msg..." |
| 280 | set rc 0 |
| 281 | if {[is_mingw]} { |
| 282 | lappend libs -lgdi32 -lwsock32 -lcrypt32 |
| 283 | } |
| @@ -351,11 +351,11 @@ | |
| 351 | user-error "The OpenSSL in source tree directory does not exist" |
| 352 | } |
| 353 | set msg "ssl in $ssldir" |
| 354 | set cflags "-I$ssldir/include" |
| 355 | set ldflags "-L$ssldir" |
| 356 | set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a" |
| 357 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs] |
| 358 | } else { |
| 359 | if {$ssldirs in {auto ""}} { |
| 360 | catch { |
| 361 | set cflags [exec pkg-config openssl --cflags-only-I] |
| 362 |
| --- auto.def | |
| +++ auto.def | |
| @@ -273,11 +273,11 @@ | |
| 273 | |
| 274 | # Check for libraries that need to be sorted out early |
| 275 | cc-check-function-in-lib iconv iconv |
| 276 | |
| 277 | # Helper for OpenSSL checking |
| 278 | proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto -lpthread}}} { |
| 279 | msg-checking "Checking for $msg..." |
| 280 | set rc 0 |
| 281 | if {[is_mingw]} { |
| 282 | lappend libs -lgdi32 -lwsock32 -lcrypt32 |
| 283 | } |
| @@ -351,11 +351,11 @@ | |
| 351 | user-error "The OpenSSL in source tree directory does not exist" |
| 352 | } |
| 353 | set msg "ssl in $ssldir" |
| 354 | set cflags "-I$ssldir/include" |
| 355 | set ldflags "-L$ssldir" |
| 356 | set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a -lpthread" |
| 357 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs] |
| 358 | } else { |
| 359 | if {$ssldirs in {auto ""}} { |
| 360 | catch { |
| 361 | set cflags [exec pkg-config openssl --cflags-only-I] |
| 362 |