diff options
Diffstat (limited to 'auto/types/typedef')
| -rw-r--r-- | auto/types/typedef | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/auto/types/typedef b/auto/types/typedef index 9762f4812..4b8964396 100644 --- a/auto/types/typedef +++ b/auto/types/typedef @@ -2,13 +2,18 @@ # Copyright (C) Igor Sysoev -echo $ngx_n "checking for $ngx_type ..." $ngx_c -echo >> $NGX_ERR -echo "checking for $ngx_type" >> $NGX_ERR +echo $ngx_n "checking for $ngx_type ...$ngx_c" -found=no +cat << END >> $NGX_AUTOCONF_ERR -for type in $ngx_type $ngx_types +---------------------------------------- +checking for $ngx_type + +END + +ngx_found=no + +for ngx_try in $ngx_type $ngx_types do cat << END > $NGX_AUTOTEST.c @@ -19,42 +24,51 @@ do #include <sys/time.h> #include <sys/resource.h> #include <netinet/in.h> -$NGX_INTTYPES_H +$NGX_INCLUDE_INTTYPES_H int main() { - $type i = 0; + $ngx_try i = 0; return 0; } END - eval "$CC -o $NGX_AUTOTEST $NGX_AUTOTEST.c >> $NGX_ERR 2>&1" + ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS -o $NGX_AUTOTEST $NGX_AUTOTEST.c" + eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" if [ -x $NGX_AUTOTEST ]; then - if [ $type = $ngx_type ]; then + if [ $ngx_try = $ngx_type ]; then echo " found" - found=yes + ngx_found=yes else - echo ", $type used" - found=$type + echo ", $ngx_try used" + ngx_found=$ngx_try fi fi - rm $NGX_AUTOTEST* + rm -f $NGX_AUTOTEST + + if [ $ngx_found = no ]; then + echo $ngx_n " $ngx_try not found$ngx_c" + + 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 - if [ $found = no ]; then - echo $ngx_n " $type not found" $ngx_c else break fi done -if [ $found = no ]; then +if [ $ngx_found = no ]; then echo echo "$0: error: can not define $ngx_type" + exit 1 fi -if [ $found != yes ]; then - echo "typedef $found $ngx_type;" >> $NGX_AUTO_CONFIG_H +if [ $ngx_found != yes ]; then + echo "typedef $ngx_found $ngx_type;" >> $NGX_AUTO_CONFIG_H fi |