Mercurial > hg > nginx-quic
changeset 3684:4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
the bug has been introduced in r2894
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 08 Jul 2010 15:57:36 +0000 |
parents | 312c2f9b53ac |
children | 9ec7238feac6 |
files | auto/lib/md5/conf auto/lib/openssl/conf auto/lib/pcre/conf auto/lib/zlib/conf auto/summary |
diffstat | 5 files changed, 18 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -94,8 +94,10 @@ else CORE_LIBS="$CORE_LIBS $ngx_feature_libs" MD5=YES MD5_LIB=$ngx_md5_lib - else + fi + fi + if [ $MD5 != YES ]; then cat << END $0: error: the HTTP cache module requires md5 functions @@ -105,9 +107,7 @@ or build the OpenSSL library statically --with-http_ssl_module --with-openssl=<path> options. END - exit 1 - fi - + exit 1 fi fi
--- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -54,7 +54,10 @@ else have=NGX_SSL . auto/have CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" OPENSSL=YES - else + fi + fi + + if [ $OPENSSL != YES ]; then cat << END @@ -64,8 +67,7 @@ into the system, or build the OpenSSL li with nginx by using --with-openssl=<path> option. END - exit 1 - fi + exit 1 fi fi
--- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -161,8 +161,10 @@ else CORE_INCS="$CORE_INCS $ngx_feature_path" CORE_LIBS="$CORE_LIBS $ngx_feature_libs" PCRE=YES - else + fi + fi + if [ $PCRE != YES ]; then cat << END $0: error: the HTTP rewrite module requires the PCRE library. @@ -171,9 +173,7 @@ option, or install the PCRE library into statically from the source with nginx by using --with-pcre=<path> option. END - exit 1 + exit 1 + fi - fi - - fi fi
--- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -57,8 +57,10 @@ else CORE_LIBS="$CORE_LIBS $ngx_feature_libs" ZLIB=YES ngx_found=no - else + fi + fi + if [ $ZLIB != YES ]; then cat << END $0: error: the HTTP gzip module requires the zlib library. @@ -67,8 +69,7 @@ option, or install the zlib library into statically from the source with nginx by using --with-zlib=<path> option. END - exit 1 - fi + exit 1 fi fi
--- a/auto/summary +++ b/auto/summary @@ -38,7 +38,6 @@ else case $PCRE in YES) echo " + using system PCRE library" ;; NONE) echo " + PCRE library is not used" ;; - NO) echo " + PCRE library is not found" ;; *) echo " + using PCRE library: $PCRE" ;; esac fi @@ -46,14 +45,12 @@ fi case $OPENSSL in YES) echo " + using system OpenSSL library" ;; NONE) echo " + OpenSSL library is not used" ;; - NO) echo " + OpenSSL library is not found" ;; *) echo " + using OpenSSL library: $OPENSSL" ;; esac case $MD5 in YES) echo " + md5: using $MD5_LIB library" ;; NONE) echo " + md5 library is not used" ;; - NO) echo " + md5 library is not found" ;; *) echo " + using md5 library: $MD5" ;; esac @@ -67,7 +64,6 @@ esac case $ZLIB in YES) echo " + using system zlib library" ;; NONE) echo " + zlib library is not used" ;; - NO) echo " + zlib library is not found" ;; *) echo " + using zlib library: $ZLIB" ;; esac