Mercurial > hg > nginx

diff auto/lib/conf @ 2940:cb3d4dc8c6db stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a16ec9e1b4d1
children 0ecc8d7c77b1
line wrap: on
line diff
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -4,15 +4,29 @@
 
 if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
     . auto/lib/pcre/conf
+
+else
+    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
+
+cat << END
+
+$0: error: the HTTP rewrite module requires the PCRE library.
+You can either disable the module by using --without-http_rewrite_module
+option or you have to enable the PCRE support.
+
+END
+        exit 1
+    fi
 fi
 
+
 if [ $USE_OPENSSL = YES ]; then
     . auto/lib/openssl/conf
 fi
 
 if [ $USE_MD5 = YES ]; then
 
-    if [ $OPENSSL != NONE -a $OPENSSL != NO ]; then
+    if [ $USE_OPENSSL = YES ]; then
         have=NGX_HAVE_OPENSSL_MD5_H . auto/have
         have=NGX_OPENSSL_MD5 . auto/have
         MD5=YES
@@ -26,7 +40,7 @@ fi
 
 if [ $USE_SHA1 = YES ]; then
 
-    if [ $OPENSSL != NONE -a $OPENSSL != NO ]; then
+    if [ $USE_OPENSSL = YES ]; then
         have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
         SHA1=YES
         SHA1_LIB=OpenSSL