Fossil SCM
Enhance ./configure so that --with-openssl=PATH also checks for a static library version of OpenSSL at PATH.
Commit
29fda91855af947c10c4a1c074d8c979efa9392d62b97141c89d5848ae65981e
Parent
f36695adf3f13bb…
1 file changed
+13
-4
M
auto.def
+13
-4
| --- auto.def | ||
| +++ auto.def | ||
| @@ -422,15 +422,15 @@ | ||
| 422 | 422 | if {$ssldirs eq "tree"} { |
| 423 | 423 | set ssldir [file dirname $autosetup(dir)]/compat/openssl |
| 424 | 424 | if {![file isdirectory $ssldir]} { |
| 425 | 425 | user-error "The OpenSSL in source tree directory does not exist" |
| 426 | 426 | } |
| 427 | - set msg "ssl in $ssldir" | |
| 427 | + set msg "openssl in $ssldir" | |
| 428 | 428 | set cflags "-I$ssldir/include" |
| 429 | 429 | set ldflags "-L$ssldir" |
| 430 | 430 | set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a -lpthread" |
| 431 | - set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs] | |
| 431 | + set found [check-for-openssl "openssl in source tree" "$cflags $ldflags" $ssllibs] | |
| 432 | 432 | } else { |
| 433 | 433 | if {$ssldirs in {auto ""}} { |
| 434 | 434 | catch { |
| 435 | 435 | set cflags [exec pkg-config openssl --cflags-only-I] |
| 436 | 436 | set ldflags [exec pkg-config openssl --libs-only-L] |
| @@ -443,21 +443,30 @@ | ||
| 443 | 443 | } |
| 444 | 444 | } |
| 445 | 445 | if {!$found} { |
| 446 | 446 | foreach dir $ssldirs { |
| 447 | 447 | if {$dir eq ""} { |
| 448 | - set msg "system ssl" | |
| 448 | + set msg "system openssl" | |
| 449 | 449 | set cflags "" |
| 450 | 450 | set ldflags "" |
| 451 | 451 | } else { |
| 452 | - set msg "ssl in $dir" | |
| 452 | + set msg "openssl in $dir" | |
| 453 | 453 | set cflags "-I$dir/include" |
| 454 | 454 | set ldflags "-L$dir/lib" |
| 455 | 455 | } |
| 456 | 456 | if {[check-for-openssl $msg "$cflags $ldflags"]} { |
| 457 | 457 | incr found |
| 458 | 458 | break |
| 459 | + } | |
| 460 | + if {$dir ne ""} { | |
| 461 | + set ldflags "" | |
| 462 | + set msg "static build of openssl in $dir" | |
| 463 | + set ssllibs "$dir/libssl.a $dir/libcrypto.a -lpthread" | |
| 464 | + if {[check-for-openssl $msg "$cflags $ldflags" $ssllibs]} { | |
| 465 | + incr found | |
| 466 | + break | |
| 467 | + } | |
| 459 | 468 | } |
| 460 | 469 | } |
| 461 | 470 | } |
| 462 | 471 | } |
| 463 | 472 | if {$found} { |
| 464 | 473 |
| --- auto.def | |
| +++ auto.def | |
| @@ -422,15 +422,15 @@ | |
| 422 | if {$ssldirs eq "tree"} { |
| 423 | set ssldir [file dirname $autosetup(dir)]/compat/openssl |
| 424 | if {![file isdirectory $ssldir]} { |
| 425 | user-error "The OpenSSL in source tree directory does not exist" |
| 426 | } |
| 427 | set msg "ssl in $ssldir" |
| 428 | set cflags "-I$ssldir/include" |
| 429 | set ldflags "-L$ssldir" |
| 430 | set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a -lpthread" |
| 431 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs] |
| 432 | } else { |
| 433 | if {$ssldirs in {auto ""}} { |
| 434 | catch { |
| 435 | set cflags [exec pkg-config openssl --cflags-only-I] |
| 436 | set ldflags [exec pkg-config openssl --libs-only-L] |
| @@ -443,21 +443,30 @@ | |
| 443 | } |
| 444 | } |
| 445 | if {!$found} { |
| 446 | foreach dir $ssldirs { |
| 447 | if {$dir eq ""} { |
| 448 | set msg "system ssl" |
| 449 | set cflags "" |
| 450 | set ldflags "" |
| 451 | } else { |
| 452 | set msg "ssl in $dir" |
| 453 | set cflags "-I$dir/include" |
| 454 | set ldflags "-L$dir/lib" |
| 455 | } |
| 456 | if {[check-for-openssl $msg "$cflags $ldflags"]} { |
| 457 | incr found |
| 458 | break |
| 459 | } |
| 460 | } |
| 461 | } |
| 462 | } |
| 463 | if {$found} { |
| 464 |
| --- auto.def | |
| +++ auto.def | |
| @@ -422,15 +422,15 @@ | |
| 422 | if {$ssldirs eq "tree"} { |
| 423 | set ssldir [file dirname $autosetup(dir)]/compat/openssl |
| 424 | if {![file isdirectory $ssldir]} { |
| 425 | user-error "The OpenSSL in source tree directory does not exist" |
| 426 | } |
| 427 | set msg "openssl in $ssldir" |
| 428 | set cflags "-I$ssldir/include" |
| 429 | set ldflags "-L$ssldir" |
| 430 | set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a -lpthread" |
| 431 | set found [check-for-openssl "openssl in source tree" "$cflags $ldflags" $ssllibs] |
| 432 | } else { |
| 433 | if {$ssldirs in {auto ""}} { |
| 434 | catch { |
| 435 | set cflags [exec pkg-config openssl --cflags-only-I] |
| 436 | set ldflags [exec pkg-config openssl --libs-only-L] |
| @@ -443,21 +443,30 @@ | |
| 443 | } |
| 444 | } |
| 445 | if {!$found} { |
| 446 | foreach dir $ssldirs { |
| 447 | if {$dir eq ""} { |
| 448 | set msg "system openssl" |
| 449 | set cflags "" |
| 450 | set ldflags "" |
| 451 | } else { |
| 452 | set msg "openssl in $dir" |
| 453 | set cflags "-I$dir/include" |
| 454 | set ldflags "-L$dir/lib" |
| 455 | } |
| 456 | if {[check-for-openssl $msg "$cflags $ldflags"]} { |
| 457 | incr found |
| 458 | break |
| 459 | } |
| 460 | if {$dir ne ""} { |
| 461 | set ldflags "" |
| 462 | set msg "static build of openssl in $dir" |
| 463 | set ssllibs "$dir/libssl.a $dir/libcrypto.a -lpthread" |
| 464 | if {[check-for-openssl $msg "$cflags $ldflags" $ssllibs]} { |
| 465 | incr found |
| 466 | break |
| 467 | } |
| 468 | } |
| 469 | } |
| 470 | } |
| 471 | } |
| 472 | if {$found} { |
| 473 |