diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-10-21 19:34:38 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-21 19:34:38 +0400 |
commit | c0edbcce58b03b89c70f1eb39cb44c74c4c7453a (patch) | |
tree | 1ce72a5b51d724a0c054e079c2b1507ca85a145d /auto/feature | |
parent | ac64333a44f39d5a658832517a106961f32f6aae (diff) |
nginx-0.1.2-RELEASE importrelease-0.1.2
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; the bug had appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; the bug had appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
Diffstat (limited to 'auto/feature')
-rw-r--r-- | auto/feature | 63 |
1 files changed, 47 insertions, 16 deletions
diff --git a/auto/feature b/auto/feature index bd5b08158..78676ef09 100644 --- a/auto/feature +++ b/auto/feature @@ -2,19 +2,28 @@ # Copyright (C) Igor Sysoev -echo $ngx_n "checking for $ngx_feature ..." $ngx_c -echo >> $NGX_ERR -echo "checking for $ngx_feature" >> $NGX_ERR +echo $ngx_n "checking for $ngx_feature ...$ngx_c" + +cat << END >> $NGX_AUTOCONF_ERR + +---------------------------------------- +checking for $ngx_feature + +END ngx_found=no -feature=`echo $ngx_feature_name | tr '[a-z]' '[A-Z]'` +if test -n "$ngx_feature_name"; then + ngx_have_feature=`echo NGX_$ngx_feature_name | tr '[a-z]' '[A-Z]'` + # STUB + ngx_have_feature0=`echo HAVE_$ngx_feature_name | tr '[a-z]' '[A-Z]'` +fi cat << END > $NGX_AUTOTEST.c #include <sys/types.h> -$NGX_UNISTD_H -$ngx_feature_inc +$NGX_INCLUDE_UNISTD_H +$ngx_feature_incs int main() { $ngx_feature_test; @@ -23,34 +32,56 @@ int main() { END -test="$CC_WARN $CC_TEST_FLAGS -o $NGX_AUTOTEST $NGX_AUTOTEST.c \ - $ngx_feature_libs" -eval "$test >> $NGX_ERR 2>&1" + +ngx_test="$CC $CC_TEST_FLAGS $CC_WARN $CC_AUX_FLAGS \ + -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" +eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" + if [ -x $NGX_AUTOTEST ]; then if [ $ngx_feature_run = yes ]; then + if $NGX_AUTOTEST 2>&1 > /dev/null; then echo " found" - have=HAVE_$feature . auto/have ngx_found=yes + + if test -n "$ngx_feature_name"; then + have=$ngx_have_feature . auto/have + fi + + #STUB + if test -n "$ngx_feature_name"; then + have=$ngx_have_feature0 . auto/have + fi + else echo " found but is not working" fi else echo " found" - have=HAVE_$feature . auto/have ngx_found=yes + + if test -n "$ngx_feature_name"; then + have=$ngx_have_feature . auto/have + fi + + #STUB + if test -n "$ngx_feature_name"; then + have=$ngx_have_feature0 . auto/have + fi + fi else echo " not found" - echo "---------" >> $NGX_ERR - cat $NGX_AUTOTEST.c >> $NGX_ERR - echo "---------" >> $NGX_ERR - echo $test >> $NGX_ERR - echo "---------" >> $NGX_ERR + + echo "----------" >> $NGX_AUTOCONF_ERR + cat $NGX_AUTOTEST.c >> $NGX_AUTOCONF_ERR + echo "----------" >> $NGX_AUTOCONF_ERR + echo $ngx_test >> $NGX_AUTOCONF_ERR + echo "----------" >> $NGX_AUTOCONF_ERR fi rm $NGX_AUTOTEST* |