Klaus Demo nginx / a24d4d2
Merge of r4759, r4762, r4768: configure minor fixes. *) Replaced a number of "else if" with "elif". *) Made sure to run configure in a "C" locale. Otherwise, we may fail to properly detect a version of compiler. *) Removed extraneous GCC warning flags. Maxim Dounin 9 years ago
3 changed file(s) with 13 addition(s) and 29 deletion(s). Raw diff Collapse all Expand all
154154 3.* | 4.* )
155155 # we have a lot of the unused function arguments
156156 CFLAGS="$CFLAGS -Wno-unused-parameter"
157 CFLAGS="$CFLAGS -Wunused-function"
158 CFLAGS="$CFLAGS -Wunused-variable"
159 CFLAGS="$CFLAGS -Wunused-value"
160157 # 4.2.1 shows the warning in wrong places
161158 #CFLAGS="$CFLAGS -Wunreachable-code"
162159 ;;
3131 NGX_CC_NAME=msvc10
3232 echo " + using Microsoft Visual C++ 10 compiler"
3333
34 else if `$NGX_WINE $CC -v 2>&1 \
34 elif `$NGX_WINE $CC -v 2>&1 \
3535 | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
3636 >/dev/null 2>&1`; then
3737
3838 NGX_CC_NAME=msvc8
3939 echo " + using Microsoft Visual C++ 8 compiler"
4040
41 else if `$NGX_WINE $CC -v 2>&1 \
41 elif `$NGX_WINE $CC -v 2>&1 \
4242 | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \
4343 >/dev/null 2>&1`; then
4444
4949 NGX_CC_NAME=msvc
5050 echo " + using Microsoft Visual C++ compiler"
5151 fi
52 fi
53 fi
5452
55 else
56 if [ "$CC" = wcl386 ]; then
53 elif [ "$CC" = wcl386 ]; then
5754 NGX_CC_NAME=owc
5855 echo " + using Open Watcom C compiler"
5956
60 else
61 if [ "$CC" = bcc32 ]; then
57 elif [ "$CC" = bcc32 ]; then
6258 NGX_CC_NAME=bcc
6359 echo " + using Borland C++ compiler"
6460
65 else
66 if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
61 elif `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
6762 NGX_CC_NAME=icc
6863 echo " + using Intel C++ compiler"
6964
70 else
71 if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
65 elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
7266 NGX_CC_NAME=gcc
7367 echo " + using GNU C compiler"
7468
75 else
76 if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
69 elif `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
7770 NGX_CC_NAME=sunc
7871 echo " + using Sun C compiler"
7972
80 else
81 if `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
73 elif `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
8274 NGX_CC_NAME=ccc
8375 echo " + using Compaq C compiler"
8476
85 else
86 if `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
77 elif `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
8778 NGX_CC_NAME=acc
8879 echo " + using HP aC++ compiler"
8980
9081 else
9182 NGX_CC_NAME=unknown
9283
93 fi # acc
94 fi # ccc
95 fi # sunc
96 fi # icc
97 fi # gcc
98 fi # bcc
99 fi # owc
100 fi # msvc
84 fi
22 # Copyright (C) Igor Sysoev
33 # Copyright (C) Nginx, Inc.
44
5
6 LC_ALL=C
7 export LC_ALL
58
69 . auto/options
710 . auto/init