Mercurial > hg > nginx
comparison auto/lib/zlib/conf @ 2940:cb3d4dc8c6db stable-0.7
merge r2893, r2894, and r2917:
various ./configure fixes:
*) use md5/sha1 in OpenSSL only if OpenSSL is used
*) stop ./configure at once on library failure
*) librt must be tested before creating Makefile
the bug has been introduced in r2817
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 15 Jun 2009 08:49:53 +0000 |
| parents | 7af8276b1c2f |
| children | 4d47a0658e7d |
comparison
equal
deleted
inserted
replaced
| 2939:7d8667499ddc | 2940:cb3d4dc8c6db |
|---|---|
| 55 | 55 |
| 56 if [ $ngx_found = yes ]; then | 56 if [ $ngx_found = yes ]; then |
| 57 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" | 57 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
| 58 ZLIB=YES | 58 ZLIB=YES |
| 59 ngx_found=no | 59 ngx_found=no |
| 60 else | |
| 61 | |
| 62 cat << END | |
| 63 | |
| 64 $0: error: the HTTP gzip module requires the zlib library. | |
| 65 You can either disable the module by using --without-http_gzip_module | |
| 66 option, or install the zlib library into the system, or build the zlib library | |
| 67 statically from the source with nginx by using --with-zlib=<path> option. | |
| 68 | |
| 69 END | |
| 70 exit 1 | |
| 60 fi | 71 fi |
| 61 fi | 72 fi |
| 62 | 73 |
| 63 fi | 74 fi |