Fossil SCM
When openssl is compiled statically with zlib support "-lz" must be after "-lssl"
Commit
328be9da5761d1cae8009f655e184c631f29dfb1
Parent
636982a5641dde7…
1 file changed
+11
-11
M
auto.def
+11
-11
| --- auto.def | ||
| +++ auto.def | ||
| @@ -89,21 +89,10 @@ | ||
| 89 | 89 | if {[opt-bool static]} { |
| 90 | 90 | # XXX: This will not work on all systems. |
| 91 | 91 | define-append EXTRA_LDFLAGS -static |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | -# Check for zlib, using the given location if specified | |
| 95 | -set zlibpath [opt-val with-zlib] | |
| 96 | -if {$zlibpath ne ""} { | |
| 97 | - cc-with [list -cflags "-I$zlibpath -L$zlibpath"] | |
| 98 | - define-append EXTRA_CFLAGS -I$zlibpath | |
| 99 | - define-append EXTRA_LDFLAGS -L$zlibpath | |
| 100 | -} | |
| 101 | -if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} { | |
| 102 | - user-error "zlib not found please install it or specify the location with --with-zlib" | |
| 103 | -} | |
| 104 | - | |
| 105 | 94 | set tclpath [opt-val with-tcl] |
| 106 | 95 | if {$tclpath ne ""} { |
| 107 | 96 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 108 | 97 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 109 | 98 | if {$tclpath eq "1"} { |
| @@ -226,10 +215,21 @@ | ||
| 226 | 215 | } |
| 227 | 216 | } else { |
| 228 | 217 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 229 | 218 | } |
| 230 | 219 | } |
| 220 | + | |
| 221 | +# Check for zlib, using the given location if specified | |
| 222 | +set zlibpath [opt-val with-zlib] | |
| 223 | +if {$zlibpath ne ""} { | |
| 224 | + cc-with [list -cflags "-I$zlibpath -L$zlibpath"] | |
| 225 | + define-append EXTRA_CFLAGS -I$zlibpath | |
| 226 | + define-append EXTRA_LDFLAGS -L$zlibpath | |
| 227 | +} | |
| 228 | +if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} { | |
| 229 | + user-error "zlib not found please install it or specify the location with --with-zlib" | |
| 230 | +} | |
| 231 | 231 | |
| 232 | 232 | if {[opt-bool lineedit]} { |
| 233 | 233 | # Need readline-compatible line editing |
| 234 | 234 | cc-with {-includes stdio.h} { |
| 235 | 235 | if {[cc-check-includes readline/readline.h] && [cc-check-function-in-lib readline readline]} { |
| 236 | 236 |
| --- auto.def | |
| +++ auto.def | |
| @@ -89,21 +89,10 @@ | |
| 89 | if {[opt-bool static]} { |
| 90 | # XXX: This will not work on all systems. |
| 91 | define-append EXTRA_LDFLAGS -static |
| 92 | } |
| 93 | |
| 94 | # Check for zlib, using the given location if specified |
| 95 | set zlibpath [opt-val with-zlib] |
| 96 | if {$zlibpath ne ""} { |
| 97 | cc-with [list -cflags "-I$zlibpath -L$zlibpath"] |
| 98 | define-append EXTRA_CFLAGS -I$zlibpath |
| 99 | define-append EXTRA_LDFLAGS -L$zlibpath |
| 100 | } |
| 101 | if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} { |
| 102 | user-error "zlib not found please install it or specify the location with --with-zlib" |
| 103 | } |
| 104 | |
| 105 | set tclpath [opt-val with-tcl] |
| 106 | if {$tclpath ne ""} { |
| 107 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 108 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 109 | if {$tclpath eq "1"} { |
| @@ -226,10 +215,21 @@ | |
| 226 | } |
| 227 | } else { |
| 228 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 229 | } |
| 230 | } |
| 231 | |
| 232 | if {[opt-bool lineedit]} { |
| 233 | # Need readline-compatible line editing |
| 234 | cc-with {-includes stdio.h} { |
| 235 | if {[cc-check-includes readline/readline.h] && [cc-check-function-in-lib readline readline]} { |
| 236 |
| --- auto.def | |
| +++ auto.def | |
| @@ -89,21 +89,10 @@ | |
| 89 | if {[opt-bool static]} { |
| 90 | # XXX: This will not work on all systems. |
| 91 | define-append EXTRA_LDFLAGS -static |
| 92 | } |
| 93 | |
| 94 | set tclpath [opt-val with-tcl] |
| 95 | if {$tclpath ne ""} { |
| 96 | set tclprivatestubs [opt-bool with-tcl-private-stubs] |
| 97 | # Note parse-tclconfig-sh is in autosetup/local.tcl |
| 98 | if {$tclpath eq "1"} { |
| @@ -226,10 +215,21 @@ | |
| 215 | } |
| 216 | } else { |
| 217 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 218 | } |
| 219 | } |
| 220 | |
| 221 | # Check for zlib, using the given location if specified |
| 222 | set zlibpath [opt-val with-zlib] |
| 223 | if {$zlibpath ne ""} { |
| 224 | cc-with [list -cflags "-I$zlibpath -L$zlibpath"] |
| 225 | define-append EXTRA_CFLAGS -I$zlibpath |
| 226 | define-append EXTRA_LDFLAGS -L$zlibpath |
| 227 | } |
| 228 | if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} { |
| 229 | user-error "zlib not found please install it or specify the location with --with-zlib" |
| 230 | } |
| 231 | |
| 232 | if {[opt-bool lineedit]} { |
| 233 | # Need readline-compatible line editing |
| 234 | cc-with {-includes stdio.h} { |
| 235 | if {[cc-check-includes readline/readline.h] && [cc-check-function-in-lib readline readline]} { |
| 236 |