Mercurial > hg > nginx-mail

comparison auto/cc/conf @ 665:0b460e61bdcd default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 016632f0fb18
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
102 CC_TEST_FLAGS="$CC_TEST_FLAGS $NGX_CC_OPT" 102 CC_TEST_FLAGS="$CC_TEST_FLAGS $NGX_CC_OPT"
103 103
104 fi 104 fi
105 105
106 CFLAGS="$CFLAGS $NGX_CC_OPT" 106 CFLAGS="$CFLAGS $NGX_CC_OPT"
107 107 NGX_TEST_LD_OPT="$NGX_LD_OPT"
108 108
109 if [ "$NGX_PLATFORM" != win32 ]; then 109 if [ "$NGX_PLATFORM" != win32 ]; then
110 110
111 if test -n "$NGX_LD_OPT"; then 111 if test -n "$NGX_LD_OPT"; then
112 ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\" 112 ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\"
123 echo 123 echo
124 exit 1 124 exit 1
125 fi 125 fi
126 fi 126 fi
127 127
128 ngx_feature="gcc variadic macros" 128
129 ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" 129 ngx_feature="gcc builtin atomic operations"
130 ngx_feature_name=NGX_HAVE_GCC_ATOMIC
130 ngx_feature_run=yes 131 ngx_feature_run=yes
131 ngx_feature_incs="#include <stdio.h> 132 ngx_feature_incs=
132 #define var(dummy, args...) sprintf(args)"
133 ngx_feature_path= 133 ngx_feature_path=
134 ngx_feature_libs= 134 ngx_feature_libs=
135 ngx_feature_test="char buf[30]; buf[0] = '0'; 135 ngx_feature_test="long n = 0;
136 var(0, buf, \"%d\", 1); 136 if (!__sync_bool_compare_and_swap(&n, 0, 1))
137 if (buf[0] != '1') return 1" 137 return 1;
138 if (__sync_fetch_and_add(&n, 1) != 1)
139 return 1;
140 if (n != 2)
141 return 1;
142 __sync_synchronize();"
138 . auto/feature 143 . auto/feature
139 144
140 145
141 if [ "$NGX_CC_NAME" = "ccc" ]; then 146 if [ "$NGX_CC_NAME" = "ccc" ]; then
142 echo "checking for C99 variadic macros ... disabled" 147 echo "checking for C99 variadic macros ... disabled"
153 if (buf[0] != '1') return 1" 158 if (buf[0] != '1') return 1"
154 . auto/feature 159 . auto/feature
155 fi 160 fi
156 161
157 162
163 ngx_feature="gcc variadic macros"
164 ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
165 ngx_feature_run=yes
166 ngx_feature_incs="#include <stdio.h>
167 #define var(dummy, args...) sprintf(args)"
168 ngx_feature_path=
169 ngx_feature_libs=
170 ngx_feature_test="char buf[30]; buf[0] = '0';
171 var(0, buf, \"%d\", 1);
172 if (buf[0] != '1') return 1"
173 . auto/feature
174
175
158 # ngx_feature="inline" 176 # ngx_feature="inline"
159 # ngx_feature_name= 177 # ngx_feature_name=
160 # ngx_feature_run=no 178 # ngx_feature_run=no
161 # ngx_feature_incs="int inline f(void) { return 1 }" 179 # ngx_feature_incs="int inline f(void) { return 1 }"
162 # ngx_feature_path= 180 # ngx_feature_path=