Mercurial > hg > nginx-vendor-current

diff auto/types/typedef @ 4:4b2dafa26fe2 NGINX_0_1_2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 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; bug 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; bug 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.
author Igor Sysoev <http://sysoev.ru>
date Thu, 21 Oct 2004 00:00:00 +0400
parents f0b350454894
children 91372f004adf
line wrap: on
line diff
--- 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"
+
+cat << END >> $NGX_AUTOCONF_ERR
 
-found=no
+----------------------------------------
+checking for $ngx_type
 
-for type in $ngx_type $ngx_types
+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"
 
-    if [ $found = no ]; then
-        echo $ngx_n " $type 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
+
     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