[nginx] svn commit: r4474 - in trunk: auto/lib/perl src/http/modules/perl

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-02-13 15:38:48 +0000 (Mon, 13 Feb 2012)
New Revision: 4474

Log:
Fixed build with embedded perl and --with-openssl.


Modified:
   trunk/auto/lib/perl/make
   trunk/src/http/modules/perl/Makefile.PL

Modified: trunk/auto/lib/perl/make
===================================================================
--- trunk/auto/lib/perl/make	2012-02-13 15:35:48 UTC (rev 4473)
+++ trunk/auto/lib/perl/make	2012-02-13 15:38:48 UTC (rev 4474)
@@ -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: trunk/src/http/modules/perl/Makefile.PL
===================================================================
--- trunk/src/http/modules/perl/Makefile.PL	2012-02-13 15:35:48 UTC (rev 4473)
+++ trunk/src/http/modules/perl/Makefile.PL	2012-02-13 15:38:48 UTC (rev 4474)
@@ -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'     =>