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

[ru at nginx.com]

Author: ru
Date: 2012-12-03 16:00:26 +0000 (Mon, 03 Dec 2012)
New Revision: 4946
URL: http://trac.nginx.org/nginx/changeset/4946/nginx

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


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-11-30 11:26:50 UTC (rev 4945)
+++ trunk/auto/lib/perl/make	2012-12-03 16:00:26 UTC (rev 4946)
@@ -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: trunk/src/http/modules/perl/Makefile.PL
===================================================================
--- trunk/src/http/modules/perl/Makefile.PL	2012-11-30 11:26:50 UTC (rev 4945)
+++ trunk/src/http/modules/perl/Makefile.PL	2012-12-03 16:00:26 UTC (rev 4946)
@@ -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'     =>