IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Maxim Dounin 2013-04-19 12:19:57 +00:00
parent 4352782879
commit 9d4e3c3612
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/lib/perl/make
View File

@ -31,7 +31,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
cd $NGX_OBJS/src/http/modules/perl \\ cd $NGX_OBJS/src/http/modules/perl \\
&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\ && 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_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
$NGX_PERL Makefile.PL \\ $NGX_PERL Makefile.PL \\
LIB=$NGX_PERL_MODULES \\ LIB=$NGX_PERL_MODULES \\

2
src/http/modules/perl/Makefile.PL
View File

@ -22,7 +22,7 @@ WriteMakefile(
depend => { depend => {
'nginx.c' => join(" ", map { 'nginx.c' => join(" ", map {
"../../../../../$_" m#^/# ? $_ : "../../../../../$_"
} (split(/\s+/, $ENV{NGX_DEPS}), } (split(/\s+/, $ENV{NGX_DEPS}),
"src/http/modules/perl/ngx_http_perl_module.h")) "src/http/modules/perl/ngx_http_perl_module.h"))
}, },