Author: mdounin
Date: 2012-08-06 17:03:01 +0000 (Mon, 06 Aug 2012)
New Revision: 4798
URL: http://trac.nginx.org/nginx/changeset/4798/nginx

Log:
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.


Modified:
branches/stable-1.2/
branches/stable-1.2/auto/cc/gcc
branches/stable-1.2/auto/cc/name
branches/stable-1.2/auto/configure

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-08-06 16:24:22 UTC (rev 4797)
+++ branches/stable-1.2 2012-08-06 17:03:01 UTC (rev 4798)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4758
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4759,4762,4768
\ No newline at end of property
Modified: branches/stable-1.2/auto/cc/gcc
===================================================================
--- branches/stable-1.2/auto/cc/gcc 2012-08-06 16:24:22 UTC (rev 4797)
+++ branches/stable-1.2/auto/cc/gcc 2012-08-06 17:03:01 UTC (rev 4798)
@@ -155,9 +155,6 @@
3.* | 4.* )
# we have a lot of the unused function arguments
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
#CFLAGS="$CFLAGS -Wunreachable-code"
;;

Modified: branches/stable-1.2/auto/cc/name
===================================================================
--- branches/stable-1.2/auto/cc/name 2012-08-06 16:24:22 UTC (rev 4797)
+++ branches/stable-1.2/auto/cc/name 2012-08-06 17:03:01 UTC (rev 4798)
@@ -32,14 +32,14 @@
NGX_CC_NAME=msvc10
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' \
>/dev/null 2>&1`; then

NGX_CC_NAME=msvc8
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' \
>/dev/null 2>&1`; then

@@ -50,52 +50,36 @@
NGX_CC_NAME=msvc
echo " + using Microsoft Visual C++ compiler"
fi
- fi
- fi

-else
-if [ "$CC" = wcl386 ]; then
+elif [ "$CC" = wcl386 ]; then
NGX_CC_NAME=owc
echo " + using Open Watcom C compiler"

-else
-if [ "$CC" = bcc32 ]; then
+elif [ "$CC" = bcc32 ]; then
NGX_CC_NAME=bcc
echo " + using Borland C++ compiler"

-else
-if `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
+elif `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then
NGX_CC_NAME=icc
echo " + using Intel C++ compiler"

-else
-if `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
+elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
NGX_CC_NAME=gcc
echo " + using GNU C compiler"

-else
-if `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
+elif `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then
NGX_CC_NAME=sunc
echo " + using Sun C compiler"

-else
-if `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
+elif `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then
NGX_CC_NAME=ccc
echo " + using Compaq C compiler"

-else
-if `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
+elif `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then
NGX_CC_NAME=acc
echo " + using HP aC++ compiler"

else
NGX_CC_NAME=unknown

-fi # acc
-fi # ccc
-fi # sunc
-fi # icc
-fi # gcc
-fi # bcc
-fi # owc
-fi # msvc
+fi

Modified: branches/stable-1.2/auto/configure
===================================================================
--- branches/stable-1.2/auto/configure 2012-08-06 16:24:22 UTC (rev 4797)
+++ branches/stable-1.2/auto/configure 2012-08-06 17:03:01 UTC (rev 4798)
@@ -4,6 +4,9 @@
# Copyright (C) Nginx, Inc.


+LC_ALL=C
+export LC_ALL
+
. auto/options
. auto/init
. auto/sources

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel