Fossil SCM
auto.def: --with-zlib=tree now fails if compat/zlib is not configured and built in advance, resolving the curious problem that the downstream test for openssl fails if libz is not built. Problem discovered by Daniel D. and reported in /chat.
Commit
b0dc2792051339b77d29d8274441f6147ba5d86c0ca386c89e14b717739f5e94
Parent
18acd94828f1db2…
1 file changed
+2
M
auto.def
+2
| --- auto.def | ||
| +++ auto.def | ||
| @@ -349,10 +349,12 @@ | ||
| 349 | 349 | set zlibpath [opt-val with-zlib] |
| 350 | 350 | if {$zlibpath eq "tree"} { |
| 351 | 351 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 352 | 352 | if {![file isdirectory $zlibdir]} { |
| 353 | 353 | user-error "The zlib in source tree directory does not exist" |
| 354 | + } elseif { ([llength [glob -nocomplain -directory $zlibdir libz*]] == 0) } { | |
| 355 | + user-error "With --with-zlib=tree, $zlibdir must be configured and built first." | |
| 354 | 356 | } |
| 355 | 357 | cc-with [list -cflags "-I$zlibdir -L$zlibdir"] |
| 356 | 358 | define-append EXTRA_CFLAGS -I$zlibdir |
| 357 | 359 | define-append LIBS $zlibdir/libz.a |
| 358 | 360 | set ::zlib_lib $zlibdir/libz.a |
| 359 | 361 |
| --- auto.def | |
| +++ auto.def | |
| @@ -349,10 +349,12 @@ | |
| 349 | set zlibpath [opt-val with-zlib] |
| 350 | if {$zlibpath eq "tree"} { |
| 351 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 352 | if {![file isdirectory $zlibdir]} { |
| 353 | user-error "The zlib in source tree directory does not exist" |
| 354 | } |
| 355 | cc-with [list -cflags "-I$zlibdir -L$zlibdir"] |
| 356 | define-append EXTRA_CFLAGS -I$zlibdir |
| 357 | define-append LIBS $zlibdir/libz.a |
| 358 | set ::zlib_lib $zlibdir/libz.a |
| 359 |
| --- auto.def | |
| +++ auto.def | |
| @@ -349,10 +349,12 @@ | |
| 349 | set zlibpath [opt-val with-zlib] |
| 350 | if {$zlibpath eq "tree"} { |
| 351 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 352 | if {![file isdirectory $zlibdir]} { |
| 353 | user-error "The zlib in source tree directory does not exist" |
| 354 | } elseif { ([llength [glob -nocomplain -directory $zlibdir libz*]] == 0) } { |
| 355 | user-error "With --with-zlib=tree, $zlibdir must be configured and built first." |
| 356 | } |
| 357 | cc-with [list -cflags "-I$zlibdir -L$zlibdir"] |
| 358 | define-append EXTRA_CFLAGS -I$zlibdir |
| 359 | define-append LIBS $zlibdir/libz.a |
| 360 | set ::zlib_lib $zlibdir/libz.a |
| 361 |