Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More zlib detection before OpenSSL detection. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | zlibBeforeOpenSsl |
| Files: | files | file ages | folders |
| SHA1: |
fd2842c08ab747a3616a2cc067b031d2 |
| User & Date: | mistachkin 2016-01-16 23:10:00 |
Context
|
2016-01-16
| ||
| 23:10 | More zlib detection before OpenSSL detection. ... (Closed-Leaf check-in: fd2842c0 user: mistachkin tags: zlibBeforeOpenSsl) | |
|
2016-01-14
| ||
| 22:33 | In the 'merge5' test, use the configured Fossil executable instead of relying on the PATH. ... (check-in: acbee54e user: mistachkin tags: trunk) | |
Changes
Changes to auto.def.
| ︙ | ︙ | |||
228 229 230 231 232 233 234 235 236 237 238 239 240 241 |
msg-result "ok"
return 1
} else {
msg-result "no"
return 0
}
}
set ssldirs [opt-val with-openssl]
if {$ssldirs ne "none"} {
set found 0
if {$ssldirs in {auto ""}} {
catch {
set cflags [exec pkg-config openssl --cflags-only-I]
| > > > > > > > > > > > > > > > > > > > > > > > > > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 |
msg-result "ok"
return 1
} else {
msg-result "no"
return 0
}
}
if {[opt-bool with-miniz]} {
define FOSSIL_ENABLE_MINIZ 1
msg-result "Using miniz for compression"
} else {
# Check for zlib, using the given location if specified
set zlibpath [opt-val with-zlib]
if {$zlibpath eq "tree"} {
set zlibdir [file dirname $autosetup(dir)]/compat/zlib
cc-with [list -cflags "-I$zlibdir"]
define-append EXTRA_CFLAGS -I$zlibdir
define-append LIBS $zlibdir/libz.a
msg-result "Using zlib in source tree"
} else {
if {$zlibpath ni {auto ""}} {
cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
define-append EXTRA_CFLAGS -I$zlibpath
define-append EXTRA_LDFLAGS -L$zlibpath
msg-result "Using zlib from $zlibpath"
}
if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} {
user-error "zlib not found please install it or specify the location with --with-zlib"
}
}
}
set ssldirs [opt-val with-openssl]
if {$ssldirs ne "none"} {
set found 0
if {$ssldirs in {auto ""}} {
catch {
set cflags [exec pkg-config openssl --cflags-only-I]
|
| ︙ | ︙ | |||
278 279 280 281 282 283 284 |
}
}
} else {
user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
}
}
| < < < < < < < < < < < < < < < < < < < < < < < < < | 303 304 305 306 307 308 309 310 311 312 313 314 315 316 |
}
}
} else {
user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
}
}
# Network functions require libraries on some systems
cc-check-function-in-lib gethostbyname nsl
if {![cc-check-function-in-lib socket {socket network}]} {
# Last resort, may be Windows
if {[string match *mingw* [get-define host]]} {
define-append LIBS -lwsock32
}
|
| ︙ | ︙ |