Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More fine-tuning. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | mingwConfigure |
| Files: | files | file ages | folders |
| SHA1: |
c76ea6b4ec49874effaccdb3a08fedd4 |
| User & Date: | mistachkin 2016-01-16 21:26:47 |
Context
|
2016-01-16
| ||
| 21:36 | Sync up the 'makemake.tcl' tool. ... (check-in: 2c7eee4c user: mistachkin tags: mingwConfigure) | |
| 21:26 | More fine-tuning. ... (check-in: c76ea6b4 user: mistachkin tags: mingwConfigure) | |
| 21:20 | Fix cut and paste error in zlib option description. ... (check-in: 2c24954c user: mistachkin tags: mingwConfigure) | |
Changes
Changes to auto.def.
| ︙ | ︙ | |||
235 236 237 238 239 240 241 |
proc check-for-openssl {msg {cflags {}}} {
msg-checking "Checking for $msg..."
set rc 0
set libs {-lssl -lcrypto}
if {[is_mingw]} {
lappend libs -lgdi32 -lwsock32
}
| | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 |
proc check-for-openssl {msg {cflags {}}} {
msg-checking "Checking for $msg..."
set rc 0
set libs {-lssl -lcrypto}
if {[is_mingw]} {
lappend libs -lgdi32 -lwsock32
}
if {[info exists ::zlib_for_ssl]} {
lappend libs $::zlib_for_ssl
}
msg-quiet cc-with [list -cflags $cflags -libs $libs] {
if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {
incr rc
}
}
|
| ︙ | ︙ | |||
260 261 262 263 264 265 266 267 268 269 270 271 272 273 |
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 -L$zlibdir"]
define-append EXTRA_CFLAGS -I$zlibdir
define-append LIBS $zlibdir/libz.a
set ::zlib_for_ssl $zlibdir/libz.a
msg-result "Using zlib in source tree"
} else {
if {$zlibpath ni {auto ""}} {
| > > > | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 |
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
if {![file isdirectory $zlibdir]} {
user-error "The zlib in source tree directory does not exist"
}
cc-with [list -cflags "-I$zlibdir -L$zlibdir"]
define-append EXTRA_CFLAGS -I$zlibdir
define-append LIBS $zlibdir/libz.a
set ::zlib_for_ssl $zlibdir/libz.a
msg-result "Using zlib in source tree"
} else {
if {$zlibpath ni {auto ""}} {
|
| ︙ | ︙ | |||
287 288 289 290 291 292 293 294 295 296 297 298 299 300 |
if {$ssldirs ne "none"} {
if {[opt-bool with-miniz]} {
user-error "The --with-miniz option is incompatible with OpenSSL"
}
set found 0
if {$ssldirs eq "tree"} {
set ssldir [file dirname $autosetup(dir)]/compat/openssl
set msg "ssl in $ssldir"
set cflags "-I$ssldir/include"
set ldflags "-L$ssldir"
set found [check-for-openssl "ssl in source tree" "$cflags $ldflags"]
} else {
if {$ssldirs in {auto ""}} {
catch {
| > > > | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 |
if {$ssldirs ne "none"} {
if {[opt-bool with-miniz]} {
user-error "The --with-miniz option is incompatible with OpenSSL"
}
set found 0
if {$ssldirs eq "tree"} {
set ssldir [file dirname $autosetup(dir)]/compat/openssl
if {![file isdirectory $ssldir]} {
user-error "The OpenSSL in source tree directory does not exist"
}
set msg "ssl in $ssldir"
set cflags "-I$ssldir/include"
set ldflags "-L$ssldir"
set found [check-for-openssl "ssl in source tree" "$cflags $ldflags"]
} else {
if {$ssldirs in {auto ""}} {
catch {
|
| ︙ | ︙ |