Fossil SCM
More fine-tuning.
Commit
c76ea6b4ec49874effaccdb3a08fedd40e5a25c2
Parent
2c24954c345aacf…
1 file changed
+7
-1
M
auto.def
+7
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -237,11 +237,11 @@ | ||
| 237 | 237 | set rc 0 |
| 238 | 238 | set libs {-lssl -lcrypto} |
| 239 | 239 | if {[is_mingw]} { |
| 240 | 240 | lappend libs -lgdi32 -lwsock32 |
| 241 | 241 | } |
| 242 | - if {[info exists ::zlib_for_ssl]} then { | |
| 242 | + if {[info exists ::zlib_for_ssl]} { | |
| 243 | 243 | lappend libs $::zlib_for_ssl |
| 244 | 244 | } |
| 245 | 245 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 246 | 246 | if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} { |
| 247 | 247 | incr rc |
| @@ -262,10 +262,13 @@ | ||
| 262 | 262 | } else { |
| 263 | 263 | # Check for zlib, using the given location if specified |
| 264 | 264 | set zlibpath [opt-val with-zlib] |
| 265 | 265 | if {$zlibpath eq "tree"} { |
| 266 | 266 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 267 | + if {![file isdirectory $zlibdir]} { | |
| 268 | + user-error "The zlib in source tree directory does not exist" | |
| 269 | + } | |
| 267 | 270 | cc-with [list -cflags "-I$zlibdir -L$zlibdir"] |
| 268 | 271 | define-append EXTRA_CFLAGS -I$zlibdir |
| 269 | 272 | define-append LIBS $zlibdir/libz.a |
| 270 | 273 | set ::zlib_for_ssl $zlibdir/libz.a |
| 271 | 274 | msg-result "Using zlib in source tree" |
| @@ -289,10 +292,13 @@ | ||
| 289 | 292 | user-error "The --with-miniz option is incompatible with OpenSSL" |
| 290 | 293 | } |
| 291 | 294 | set found 0 |
| 292 | 295 | if {$ssldirs eq "tree"} { |
| 293 | 296 | set ssldir [file dirname $autosetup(dir)]/compat/openssl |
| 297 | + if {![file isdirectory $ssldir]} { | |
| 298 | + user-error "The OpenSSL in source tree directory does not exist" | |
| 299 | + } | |
| 294 | 300 | set msg "ssl in $ssldir" |
| 295 | 301 | set cflags "-I$ssldir/include" |
| 296 | 302 | set ldflags "-L$ssldir" |
| 297 | 303 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags"] |
| 298 | 304 | } else { |
| 299 | 305 |
| --- auto.def | |
| +++ auto.def | |
| @@ -237,11 +237,11 @@ | |
| 237 | set rc 0 |
| 238 | set libs {-lssl -lcrypto} |
| 239 | if {[is_mingw]} { |
| 240 | lappend libs -lgdi32 -lwsock32 |
| 241 | } |
| 242 | if {[info exists ::zlib_for_ssl]} then { |
| 243 | lappend libs $::zlib_for_ssl |
| 244 | } |
| 245 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 246 | if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} { |
| 247 | incr rc |
| @@ -262,10 +262,13 @@ | |
| 262 | } else { |
| 263 | # Check for zlib, using the given location if specified |
| 264 | set zlibpath [opt-val with-zlib] |
| 265 | if {$zlibpath eq "tree"} { |
| 266 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 267 | cc-with [list -cflags "-I$zlibdir -L$zlibdir"] |
| 268 | define-append EXTRA_CFLAGS -I$zlibdir |
| 269 | define-append LIBS $zlibdir/libz.a |
| 270 | set ::zlib_for_ssl $zlibdir/libz.a |
| 271 | msg-result "Using zlib in source tree" |
| @@ -289,10 +292,13 @@ | |
| 289 | user-error "The --with-miniz option is incompatible with OpenSSL" |
| 290 | } |
| 291 | set found 0 |
| 292 | if {$ssldirs eq "tree"} { |
| 293 | set ssldir [file dirname $autosetup(dir)]/compat/openssl |
| 294 | set msg "ssl in $ssldir" |
| 295 | set cflags "-I$ssldir/include" |
| 296 | set ldflags "-L$ssldir" |
| 297 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags"] |
| 298 | } else { |
| 299 |
| --- auto.def | |
| +++ auto.def | |
| @@ -237,11 +237,11 @@ | |
| 237 | set rc 0 |
| 238 | set libs {-lssl -lcrypto} |
| 239 | if {[is_mingw]} { |
| 240 | lappend libs -lgdi32 -lwsock32 |
| 241 | } |
| 242 | if {[info exists ::zlib_for_ssl]} { |
| 243 | lappend libs $::zlib_for_ssl |
| 244 | } |
| 245 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 246 | if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} { |
| 247 | incr rc |
| @@ -262,10 +262,13 @@ | |
| 262 | } else { |
| 263 | # Check for zlib, using the given location if specified |
| 264 | set zlibpath [opt-val with-zlib] |
| 265 | if {$zlibpath eq "tree"} { |
| 266 | set zlibdir [file dirname $autosetup(dir)]/compat/zlib |
| 267 | if {![file isdirectory $zlibdir]} { |
| 268 | user-error "The zlib in source tree directory does not exist" |
| 269 | } |
| 270 | cc-with [list -cflags "-I$zlibdir -L$zlibdir"] |
| 271 | define-append EXTRA_CFLAGS -I$zlibdir |
| 272 | define-append LIBS $zlibdir/libz.a |
| 273 | set ::zlib_for_ssl $zlibdir/libz.a |
| 274 | msg-result "Using zlib in source tree" |
| @@ -289,10 +292,13 @@ | |
| 292 | user-error "The --with-miniz option is incompatible with OpenSSL" |
| 293 | } |
| 294 | set found 0 |
| 295 | if {$ssldirs eq "tree"} { |
| 296 | set ssldir [file dirname $autosetup(dir)]/compat/openssl |
| 297 | if {![file isdirectory $ssldir]} { |
| 298 | user-error "The OpenSSL in source tree directory does not exist" |
| 299 | } |
| 300 | set msg "ssl in $ssldir" |
| 301 | set cflags "-I$ssldir/include" |
| 302 | set ldflags "-L$ssldir" |
| 303 | set found [check-for-openssl "ssl in source tree" "$cflags $ldflags"] |
| 304 | } else { |
| 305 |