mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-21 19:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge of r4759, r4762, r4768: configure minor fixes.

Browse Source 
*) 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.
This commit is contained in:
Maxim Dounin 2012-08-06 17:03:01 +00:00
parent 7ca2e6d24e
commit a24d4d23f7
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
auto/cc/gcc
View File

@ -155,9 +155,6 @@ case "$NGX_GCC_VER" in
3.* | 4.* ) 3.* | 4.* )
# we have a lot of the unused function arguments # we have a lot of the unused function arguments
CFLAGS="$CFLAGS -Wno-unused-parameter" CFLAGS="$CFLAGS -Wno-unused-parameter"
CFLAGS="$CFLAGS -Wunused-function"
CFLAGS="$CFLAGS -Wunused-variable"
CFLAGS="$CFLAGS -Wunused-value"
# 4.2.1 shows the warning in wrong places # 4.2.1 shows the warning in wrong places
#CFLAGS="$CFLAGS -Wunreachable-code" #CFLAGS="$CFLAGS -Wunreachable-code"
;; ;;

36
auto/cc/name
View File

@ -32,14 +32,14 @@ if [ "$CC" = cl ]; then
NGX_CC_NAME=msvc10 NGX_CC_NAME=msvc10
echo " + using Microsoft Visual C++ 10 compiler" echo " + using Microsoft Visual C++ 10 compiler"
else if `$NGX_WINE $CC -v 2>&1 \ elif `$NGX_WINE $CC -v 2>&1 \
| grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \ | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
>/dev/null 2>&1`; then >/dev/null 2>&1`; then
NGX_CC_NAME=msvc8 NGX_CC_NAME=msvc8
echo " + using Microsoft Visual C++ 8 compiler" echo " + using Microsoft Visual C++ 8 compiler"
else if `$NGX_WINE $CC -v 2>&1 \ elif `$NGX_WINE $CC -v 2>&1 \
| grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \ | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \
>/dev/null 2>&1`; then >/dev/null 2>&1`; then
@ -50,52 +50,36 @@ if [ "$CC" = cl ]; then
NGX_CC_NAME=msvc NGX_CC_NAME=msvc
echo " + using Microsoft Visual C++ compiler" echo " + using Microsoft Visual C++ compiler"
fi fi
fi
fi
else elif [ "$CC" = wcl386 ]; then
if [ "$CC" = wcl386 ]; then
NGX_CC_NAME=owc NGX_CC_NAME=owc
echo " + using Open Watcom C compiler" echo " + using Open Watcom C compiler"
else elif [ "$CC" = bcc32 ]; then
if [ "$CC" = bcc32 ]; then
NGX_CC_NAME=bcc NGX_CC_NAME=bcc
echo " + using Borland C++ compiler" echo " + using Borland C++ compiler"
else elif `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
NGX_CC_NAME=icc NGX_CC_NAME=icc
echo " + using Intel C++ compiler" echo " + using Intel C++ compiler"
else elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
NGX_CC_NAME=gcc NGX_CC_NAME=gcc
echo " + using GNU C compiler" echo " + using GNU C compiler"
else elif `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
NGX_CC_NAME=sunc NGX_CC_NAME=sunc
echo " + using Sun C compiler" echo " + using Sun C compiler"
else elif `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
if `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
NGX_CC_NAME=ccc NGX_CC_NAME=ccc
echo " + using Compaq C compiler" echo " + using Compaq C compiler"
else elif `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
if `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
NGX_CC_NAME=acc NGX_CC_NAME=acc
echo " + using HP aC++ compiler" echo " + using HP aC++ compiler"
else else
NGX_CC_NAME=unknown NGX_CC_NAME=unknown
fi # acc fi
fi # ccc
fi # sunc
fi # icc
fi # gcc
fi # bcc
fi # owc
fi # msvc

3
auto/configure vendored
View File

@ -4,6 +4,9 @@
# Copyright (C) Nginx, Inc. # Copyright (C) Nginx, Inc.
LC_ALL=C
export LC_ALL
. auto/options . auto/options
. auto/init . auto/init
. auto/sources . auto/sources