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

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-04-19 12:19:57 +0000 (Fri, 19 Apr 2013)
New Revision: 5181
URL: http://trac.nginx.org/nginx/changeset/5181/nginx

Log:
Configure: fixed perl Makefile generation (ticket #334).

Dependancy tracking introduced in r5169 were not handled absolute path
names properly.  Absolute names might appear in CORE_DEPS if --with-openssl
or --with-pcre configure arguments are used to build OpenSSL/PCRE
libraries.

Additionally, revert part of r5169 to set NGX_INCS from Makefile
variables.  Makefile variables have $ngx_include_opt in them, which
might result in wrong include paths being used.  As a side effect,
this also restores build with --with-http_perl_module and --without-http
at the same time.


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

Modified: trunk/auto/lib/perl/make
===================================================================
--- trunk/auto/lib/perl/make	2013-04-18 14:26:08 UTC (rev 5180)
+++ trunk/auto/lib/perl/make	2013-04-19 12:19:57 UTC (rev 5181)
@@ -31,7 +31,7 @@
 
 	cd $NGX_OBJS/src/http/modules/perl \\
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
-			NGX_INCS="\$(CORE_INCS) \$(HTTP_INCS)" \\
+			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
 			NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
 		$NGX_PERL Makefile.PL \\
 			LIB=$NGX_PERL_MODULES \\

Modified: trunk/src/http/modules/perl/Makefile.PL
===================================================================
--- trunk/src/http/modules/perl/Makefile.PL	2013-04-18 14:26:08 UTC (rev 5180)
+++ trunk/src/http/modules/perl/Makefile.PL	2013-04-19 12:19:57 UTC (rev 5181)
@@ -22,7 +22,7 @@
 
     depend => {
         'nginx.c'     => join(" ", map {
-                             "../../../../../$_"
+                             m#^/# ? $_ : "../../../../../$_"
                          } (split(/\s+/, $ENV{NGX_DEPS}),
                             "src/http/modules/perl/ngx_http_perl_module.h"))
     },