[nginx] svn commit: r4513 - in branches/stable-1.0: . auto/cc auto/lib/perl src/http/modules/perl

mdounin at mdounin.ru mdounin at mdounin.ru
Mon Mar 5 12:58:10 UTC 2012


Author: mdounin
Date: 2012-03-05 12:58:10 +0000 (Mon, 05 Mar 2012)
New Revision: 4513

Log:
Merge of r4474, r4493: configure/build fixes.

*) Fixed build with embedded perl and --with-openssl.

*) Configure: moved icc detection before gcc.  New versions of icc
   confuse auto/cc/name due to introduced handling of a "icc -v".


Modified:
   branches/stable-1.0/
   branches/stable-1.0/auto/cc/name
   branches/stable-1.0/auto/lib/perl/make
   branches/stable-1.0/src/http/modules/perl/Makefile.PL


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4381-4385,4393,4396,4398,4400-4406,4413,4415-4416,4422-4423,4460-4461,4468,4470-4471,4473
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338-4343,4372-4375,4377,4379,4381-4385,4393,4396,4398,4400-4406,4413,4415-4416,4422-4423,4460-4461,4468,4470-4471,4473-4474,4493

Modified: branches/stable-1.0/auto/cc/name
===================================================================
--- branches/stable-1.0/auto/cc/name	2012-03-05 12:49:32 UTC (rev 4512)
+++ branches/stable-1.0/auto/cc/name	2012-03-05 12:58:10 UTC (rev 4513)
@@ -64,16 +64,16 @@
     echo " + using Borland C++ compiler"
 
 else
+if `$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
     NGX_CC_NAME=gcc
     echo " + using GNU C compiler"
 
 else
-if `$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 'Sun C' >/dev/null 2>&1`; then
     NGX_CC_NAME=sunc
     echo " + using Sun C compiler"

Modified: branches/stable-1.0/auto/lib/perl/make
===================================================================
--- branches/stable-1.0/auto/lib/perl/make	2012-03-05 12:49:32 UTC (rev 4512)
+++ branches/stable-1.0/auto/lib/perl/make	2012-03-05 12:58:10 UTC (rev 4513)
@@ -28,6 +28,7 @@
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT"	\
 			NGX_PCRE=$PCRE					\
 			NGX_OBJS=$NGX_OBJS				\
+			NGX_OPENSSL=$OPENSSL				\
 		$NGX_PERL Makefile.PL					\
 			LIB=$NGX_PERL_MODULES				\
 			INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN

Modified: branches/stable-1.0/src/http/modules/perl/Makefile.PL
===================================================================
--- branches/stable-1.0/src/http/modules/perl/Makefile.PL	2012-03-05 12:49:32 UTC (rev 4512)
+++ branches/stable-1.0/src/http/modules/perl/Makefile.PL	2012-03-05 12:58:10 UTC (rev 4513)
@@ -25,7 +25,11 @@
                          "-I ../../../../../$ENV{NGX_OBJS} " .
                          ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" :
                              ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " :
-                                  "-I ../../../../../$ENV{NGX_PCRE} ")),
+                                  "-I ../../../../../$ENV{NGX_PCRE} ")) .
+                         ($ENV{NGX_OPENSSL} =~ /^(YES|NO)/ ? "" :
+                             ($ENV{NGX_OPENSSL} =~ m#^/# ?
+                                  "-I $ENV{NGX_OPENSSL}/.openssl/include " :
+                      "-I ../../../../../$ENV{NGX_OPENSSL}/.openssl/include ")),
 
     depend => {
         'nginx.c'     =>



More information about the nginx-devel mailing list