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
This commit is contained in:
Igor Sysoev
parent
8b3cfa8884
commit
2f2fb78ff8
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -30,4 +30,15 @@ fi
|
|||
|
||||
if [ $ngx_found = yes ]; then
|
||||
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
|
||||
|
||||
else
|
||||
|
||||
cat << END
|
||||
|
||||
$0: error: the Google perftool module requires the Google perftools
|
||||
library. You can either do not enable the module or install the library.
|
||||
|
||||
END
|
||||
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -94,6 +94,18 @@ else
|
|||
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
|
||||
MD5=YES
|
||||
MD5_LIB=$ngx_md5_lib
|
||||
else
|
||||
|
||||
cat << END
|
||||
|
||||
$0: error: the HTTP cache module requires md5 functions
|
||||
from OpenSSL library. You can either disable the module by using
|
||||
--without-http_cache option, or install the OpenSSL library into the system,
|
||||
or build the OpenSSL library statically from the source with nginx by using
|
||||
--with-openssl=<path> option.
|
||||
|
||||
END
|
||||
exit 1
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -66,6 +66,17 @@ else
|
|||
have=NGX_SSL . auto/have
|
||||
CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
|
||||
OPENSSL=YES
|
||||
else
|
||||
|
||||
cat << END
|
||||
|
||||
$0: error: SSL modules require the OpenSSL library.
|
||||
You can either do not enable the modules, or install the OpenSSL library
|
||||
into the system, or build the OpenSSL library statically from the source
|
||||
with nginx by using --with-openssl=<path> option.
|
||||
|
||||
END
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -161,6 +161,18 @@ else
|
|||
CORE_INCS="$CORE_INCS $ngx_feature_path"
|
||||
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
|
||||
PCRE=YES
|
||||
else
|
||||
|
||||
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 install the PCRE library into the system, or build the PCRE library
|
||||
statically from the source with nginx by using --with-pcre=<path> option.
|
||||
|
||||
END
|
||||
exit 1
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -57,6 +57,17 @@ else
|
|||
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
|
||||
ZLIB=YES
|
||||
ngx_found=no
|
||||
else
|
||||
|
||||
cat << END
|
||||
|
||||
$0: error: the HTTP gzip module requires the zlib library.
|
||||
You can either disable the module by using --without-http_gzip_module
|
||||
option, or install the zlib library into the system, or build the zlib library
|
||||
statically from the source with nginx by using --with-zlib=<path> option.
|
||||
|
||||
END
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -252,3 +252,25 @@ if [ $ngx_found != yes ]; then
|
|||
NGX_LIBDL="-ldl"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
ngx_feature="sched_yield()"
|
||||
ngx_feature_name="NGX_HAVE_SCHED_YIELD"
|
||||
ngx_feature_run=no
|
||||
ngx_feature_incs="#include <sched.h>"
|
||||
ngx_feature_path=
|
||||
ngx_feature_libs=
|
||||
ngx_feature_test="sched_yield()"
|
||||
. auto/feature
|
||||
|
||||
|
||||
if [ $ngx_found != yes ]; then
|
||||
|
||||
ngx_feature="sched_yield() in librt"
|
||||
ngx_feature_libs="-lrt"
|
||||
. auto/feature
|
||||
|
||||
if [ $ngx_found = yes ]; then
|
||||
CORE_LIBS="$CORE_LIBS -lrt"
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
59
auto/summary
59
auto/summary
|
|
@ -74,65 +74,6 @@ esac
|
|||
echo
|
||||
|
||||
|
||||
if [ $HTTP_REWRITE = YES ]; then
|
||||
if [ $USE_PCRE = DISABLED ]; 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
|
||||
|
||||
if [ $PCRE = NONE -o $PCRE = NO ]; 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 install the PCRE library into the system, or build the PCRE library
|
||||
statically from the source with nginx by using --with-pcre=<path> option.
|
||||
|
||||
END
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if [ $HTTP_GZIP = YES ]; then
|
||||
if [ $ZLIB = NONE -o $ZLIB = NO ]; then
|
||||
|
||||
cat << END
|
||||
$0: error: the HTTP gzip module requires the zlib library.
|
||||
You can either disable the module by using --without-http_gzip_module
|
||||
option, or install the zlib library into the system, or build the zlib library
|
||||
statically from the source with nginx by using --with-zlib=<path> option.
|
||||
|
||||
END
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if [ $HTTP_SSL = YES ]; then
|
||||
if [ $OPENSSL = NONE -o $OPENSSL = NO ]; then
|
||||
|
||||
cat << END
|
||||
$0: error: the HTTP SSL module requires the OpenSSL library.
|
||||
You can either do not enable the module, or install the OpenSSL library
|
||||
into the system, or build the OpenSSL library statically from the source
|
||||
with nginx by using --with-openssl=<path> option.
|
||||
|
||||
END
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
cat << END
|
||||
nginx path prefix: "$NGX_PREFIX"
|
||||
nginx binary file: "$NGX_SBIN_PATH"
|
||||
|
|
|
|||
22
auto/unix
22
auto/unix
|
|
@ -163,28 +163,6 @@ ngx_feature_test="void *p; p = memalign(4096, 4096)"
|
|||
. auto/feature
|
||||
|
||||
|
||||
ngx_feature="sched_yield()"
|
||||
ngx_feature_name="NGX_HAVE_SCHED_YIELD"
|
||||
ngx_feature_run=no
|
||||
ngx_feature_incs="#include <sched.h>"
|
||||
ngx_feature_path=
|
||||
ngx_feature_libs=
|
||||
ngx_feature_test="sched_yield()"
|
||||
. auto/feature
|
||||
|
||||
|
||||
if [ $ngx_found != yes ]; then
|
||||
|
||||
ngx_feature="sched_yield() in librt"
|
||||
ngx_feature_libs="-lrt"
|
||||
. auto/feature
|
||||
|
||||
if [ $ngx_found = yes ]; then
|
||||
CORE_LIBS="$CORE_LIBS -lrt"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
|
||||
ngx_feature_name="NGX_HAVE_MAP_ANON"
|
||||
ngx_feature_run=yes
|
||||
|
|
|
|||
Loading…
Reference in New Issue