comparison auto/feature @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 428c6e58046a
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
37 37
38 END 38 END
39 39
40 40
41 ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \ 41 ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS $ngx_feature_inc_path \
42 -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" 42 -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_TEST_LD_OPT $ngx_feature_libs"
43 43
44 ngx_feature_inc_path= 44 ngx_feature_inc_path=
45 45
46 eval "/bin/sh -c \"$ngx_test\" >> $NGX_AUTOCONF_ERR 2>&1" 46 eval "/bin/sh -c \"$ngx_test\" >> $NGX_AUTOCONF_ERR 2>&1"
47 47
58 58
59 if test -n "$ngx_feature_name"; then 59 if test -n "$ngx_feature_name"; then
60 have=$ngx_have_feature . auto/have 60 have=$ngx_have_feature . auto/have
61 fi 61 fi
62 62
63 else
64 echo " found but is not working"
65 fi
66 ;;
67
68 value)
69 # /bin/sh is used to intercept "Killed" or "Abort trap" messages
70 if /bin/sh -c $NGX_AUTOTEST >/dev/null 2>&1; then
71 echo " found"
72 ngx_found=yes
73
74 cat << END >> $NGX_AUTO_CONFIG_H
75
76 #ifndef $ngx_feature_name
77 #define $ngx_feature_name `$NGX_AUTOTEST`
78 #endif
79
80 END
63 else 81 else
64 echo " found but is not working" 82 echo " found but is not working"
65 fi 83 fi
66 ;; 84 ;;
67 85