[nginx] svn commit: r5039 - in branches/stable-1.2: . auto/lib/perl src/http/modules/perl

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-10 02:58:03 +0000 (Sun, 10 Feb 2013)
New Revision: 5039
URL: http://trac.nginx.org/nginx/changeset/5039/nginx

Log:
Merge of r4946, r4978: perl.

*) Fixed build with embedded perl in certain setups (ticket #48).

*) Brought the link to ngx_http_perl_module documentation up to date.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/auto/lib/perl/make
   branches/stable-1.2/src/http/modules/perl/Makefile.PL
   branches/stable-1.2/src/http/modules/perl/nginx.pm

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-10 02:56:03 UTC (rev 5038)
+++ branches/stable-1.2	2013-02-10 02:58:03 UTC (rev 5039)

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-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4945,4984
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4946,4978,4984
\ No newline at end of property
Modified: branches/stable-1.2/auto/lib/perl/make
===================================================================
--- branches/stable-1.2/auto/lib/perl/make	2013-02-10 02:56:03 UTC (rev 5038)
+++ branches/stable-1.2/auto/lib/perl/make	2013-02-10 02:58:03 UTC (rev 5039)
@@ -26,9 +26,7 @@
 
 	cd $NGX_OBJS/src/http/modules/perl				\
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT"	\
-			NGX_PCRE=$PCRE					\
-			NGX_OBJS=$NGX_OBJS				\
-			NGX_OPENSSL=$OPENSSL				\
+			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS"	\
 		$NGX_PERL Makefile.PL					\
 			LIB=$NGX_PERL_MODULES				\
 			INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN

Modified: branches/stable-1.2/src/http/modules/perl/Makefile.PL
===================================================================
--- branches/stable-1.2/src/http/modules/perl/Makefile.PL	2013-02-10 02:56:03 UTC (rev 5038)
+++ branches/stable-1.2/src/http/modules/perl/Makefile.PL	2013-02-10 02:58:03 UTC (rev 5039)
@@ -16,20 +16,9 @@
     CCFLAGS           => "$ENV{NGX_PM_CFLAGS}",
     OPTIMIZE          => '-O',
 
-    INC               => "-I ../../../../../src/core " .
-                         "-I ../../../../../src/event " .
-                         "-I ../../../../../src/os/unix " .
-                         "-I ../../../../../src/http " .
-                         "-I ../../../../../src/http/modules " .
-                         "-I ../../../../../src/http/modules/perl " .
-                         "-I ../../../../../$ENV{NGX_OBJS} " .
-                         ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" :
-                             ($ENV{NGX_PCRE} =~ m#^/# ? "-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 ")),
+    INC               => join(" ", map {
+                             m#^/# ? "-I $_" : "-I ../../../../../$_"
+                         } (split /\s+/, $ENV{NGX_INCS})),
 
     depend => {
         'nginx.c'     =>

Modified: branches/stable-1.2/src/http/modules/perl/nginx.pm
===================================================================
--- branches/stable-1.2/src/http/modules/perl/nginx.pm	2013-02-10 02:56:03 UTC (rev 5038)
+++ branches/stable-1.2/src/http/modules/perl/nginx.pm	2013-02-10 02:58:03 UTC (rev 5039)
@@ -123,7 +123,7 @@
 
 =head1 SEE ALSO
 
-http://sysoev.ru/nginx/docs/http/ngx_http_perl_module.html
+http://nginx.org/en/docs/http/ngx_http_perl_module.html
 
 =head1 AUTHOR