summaryrefslogtreecommitdiffhomepage
path: root/auto/types
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-10-21 15:34:38 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-10-21 15:34:38 +0000
commitc0edbcce58b03b89c70f1eb39cb44c74c4c7453a (patch)
tree1ce72a5b51d724a0c054e079c2b1507ca85a145d /auto/types
parentac64333a44f39d5a658832517a106961f32f6aae (diff)
downloadnginx-c0edbcce58b03b89c70f1eb39cb44c74c4c7453a.tar.gz
nginx-c0edbcce58b03b89c70f1eb39cb44c74c4c7453a.tar.bz2
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/types')
-rw-r--r--auto/types/sizeof34
-rw-r--r--auto/types/typedef50
-rw-r--r--auto/types/uintptr_t2
3 files changed, 59 insertions, 27 deletions
diff --git a/auto/types/sizeof b/auto/types/sizeof
index ac22e759d..a7094e429 100644
--- a/auto/types/sizeof
+++ b/auto/types/sizeof
@@ -2,9 +2,14 @@
# Copyright (C) Igor Sysoev
-echo $ngx_n "checking for $ngx_type size ..." $ngx_c
-echo >> $NGX_ERR
-echo "checking for $ngx_type size" >> $NGX_ERR
+echo $ngx_n "checking for $ngx_type size ...$ngx_c"
+
+cat << END >> $NGX_AUTOCONF_ERR
+
+----------------------------------------
+checking for $ngx_type size
+
+END
ngx_size=
@@ -12,11 +17,11 @@ cat << END > $NGX_AUTOTEST.c
#include <sys/types.h>
#include <sys/time.h>
-$NGX_UNISTD_H
+$NGX_INCLUDE_UNISTD_H
#include <signal.h>
#include <sys/resource.h>
-$NGX_INTTYPES_H
-$NGX_AUTO_CONFIG
+$NGX_INCLUDE_INTTYPES_H
+$NGX_INCLUDE_AUTO_CONFIG_H
int main() {
printf("%d", sizeof($ngx_type));
@@ -25,14 +30,19 @@ int main() {
END
-eval "$CC $CC_TEST_FLAGS -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
ngx_size=`$NGX_AUTOTEST`
echo " $ngx_size bytes"
fi
-rm $NGX_AUTOTEST*
+
+rm -f $NGX_AUTOTEST
+
case $ngx_size in
4)
@@ -58,5 +68,13 @@ case $ngx_size in
*)
echo
echo "$0: error: can not detect $ngx_type size"
+
+ 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
+
exit 1
esac
+
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
diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index a1bb78a89..e7d8d5ca0 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -2,7 +2,7 @@
# Copyright (C) Igor Sysoev
-echo $ngx_n "checking for uintptr_t ... " $ngx_c
+echo $ngx_n "checking for uintptr_t ...$ngx_c"
echo >> $NGX_ERR
echo "checking for uintptr_t" >> $NGX_ERR