Fossil SCM
By default, use the automatic zlib detection. When --with-zlib=tree is used, use zlib from the source tree.
Commit
260266c1ec2cc2c347cd968158e395599c8dfc05
Parent
7b4153ff03982b8…
1 file changed
+4
-3
M
auto.def
+4
-3
| --- auto.def | ||
| +++ auto.def | ||
| @@ -4,11 +4,12 @@ | ||
| 4 | 4 | |
| 5 | 5 | options { |
| 6 | 6 | with-openssl:path|auto|none |
| 7 | 7 | => {Look for OpenSSL in the given path, or auto or none} |
| 8 | 8 | with-miniz=0 => {Use miniz from the source tree} |
| 9 | - with-zlib:path|auto => {Look for zlib in the given path or in the source tree} | |
| 9 | + with-zlib:path|auto|tree | |
| 10 | + => {Look for zlib in the given path, or auto or in the source tree} | |
| 10 | 11 | with-exec-rel-paths=0 |
| 11 | 12 | => {Enable relative paths for external diff/gdiff} |
| 12 | 13 | with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)} |
| 13 | 14 | with-th1-docs=0 => {Enable TH1 for embedded documentation pages} |
| 14 | 15 | with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages} |
| @@ -285,18 +286,18 @@ | ||
| 285 | 286 | define FOSSIL_ENABLE_MINIZ 1 |
| 286 | 287 | msg-result "Using miniz for compression" |
| 287 | 288 | } else { |
| 288 | 289 | # Check for zlib, using the given location if specified |
| 289 | 290 | set zlibpath [opt-val with-zlib] |
| 290 | - if {$zlibpath in {auto ""}} { | |
| 291 | + if {$zlibpath eq "tree"} { | |
| 291 | 292 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 292 | 293 | cc-with [list -cflags "-I$zlibdir"] |
| 293 | 294 | define-append EXTRA_CFLAGS -I$zlibdir |
| 294 | 295 | define-append LIBS $zlibdir/libz.a |
| 295 | 296 | msg-result "Using zlib in source tree" |
| 296 | 297 | } else { |
| 297 | - if {$zlibpath ne ""} { | |
| 298 | + if {$zlibpath ni {auto ""}} { | |
| 298 | 299 | cc-with [list -cflags "-I$zlibpath -L$zlibpath"] |
| 299 | 300 | define-append EXTRA_CFLAGS -I$zlibpath |
| 300 | 301 | define-append EXTRA_LDFLAGS -L$zlibpath |
| 301 | 302 | msg-result "Using zlib from $zlibpath" |
| 302 | 303 | } |
| 303 | 304 |
| --- auto.def | |
| +++ auto.def | |
| @@ -4,11 +4,12 @@ | |
| 4 | |
| 5 | options { |
| 6 | with-openssl:path|auto|none |
| 7 | => {Look for OpenSSL in the given path, or auto or none} |
| 8 | with-miniz=0 => {Use miniz from the source tree} |
| 9 | with-zlib:path|auto => {Look for zlib in the given path or in the source tree} |
| 10 | with-exec-rel-paths=0 |
| 11 | => {Enable relative paths for external diff/gdiff} |
| 12 | with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)} |
| 13 | with-th1-docs=0 => {Enable TH1 for embedded documentation pages} |
| 14 | with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages} |
| @@ -285,18 +286,18 @@ | |
| 285 | define FOSSIL_ENABLE_MINIZ 1 |
| 286 | msg-result "Using miniz for compression" |
| 287 | } else { |
| 288 | # Check for zlib, using the given location if specified |
| 289 | set zlibpath [opt-val with-zlib] |
| 290 | if {$zlibpath in {auto ""}} { |
| 291 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 292 | cc-with [list -cflags "-I$zlibdir"] |
| 293 | define-append EXTRA_CFLAGS -I$zlibdir |
| 294 | define-append LIBS $zlibdir/libz.a |
| 295 | msg-result "Using zlib in source tree" |
| 296 | } else { |
| 297 | if {$zlibpath ne ""} { |
| 298 | cc-with [list -cflags "-I$zlibpath -L$zlibpath"] |
| 299 | define-append EXTRA_CFLAGS -I$zlibpath |
| 300 | define-append EXTRA_LDFLAGS -L$zlibpath |
| 301 | msg-result "Using zlib from $zlibpath" |
| 302 | } |
| 303 |
| --- auto.def | |
| +++ auto.def | |
| @@ -4,11 +4,12 @@ | |
| 4 | |
| 5 | options { |
| 6 | with-openssl:path|auto|none |
| 7 | => {Look for OpenSSL in the given path, or auto or none} |
| 8 | with-miniz=0 => {Use miniz from the source tree} |
| 9 | with-zlib:path|auto|tree |
| 10 | => {Look for zlib in the given path, or auto or in the source tree} |
| 11 | with-exec-rel-paths=0 |
| 12 | => {Enable relative paths for external diff/gdiff} |
| 13 | with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)} |
| 14 | with-th1-docs=0 => {Enable TH1 for embedded documentation pages} |
| 15 | with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages} |
| @@ -285,18 +286,18 @@ | |
| 286 | define FOSSIL_ENABLE_MINIZ 1 |
| 287 | msg-result "Using miniz for compression" |
| 288 | } else { |
| 289 | # Check for zlib, using the given location if specified |
| 290 | set zlibpath [opt-val with-zlib] |
| 291 | if {$zlibpath eq "tree"} { |
| 292 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 293 | cc-with [list -cflags "-I$zlibdir"] |
| 294 | define-append EXTRA_CFLAGS -I$zlibdir |
| 295 | define-append LIBS $zlibdir/libz.a |
| 296 | msg-result "Using zlib in source tree" |
| 297 | } else { |
| 298 | if {$zlibpath ni {auto ""}} { |
| 299 | cc-with [list -cflags "-I$zlibpath -L$zlibpath"] |
| 300 | define-append EXTRA_CFLAGS -I$zlibpath |
| 301 | define-append EXTRA_LDFLAGS -L$zlibpath |
| 302 | msg-result "Using zlib from $zlibpath" |
| 303 | } |
| 304 |