Skip to content

Commit af1d115

Browse files
author
mdounin
committed
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.
1 parent 6d9f8aa commit af1d115

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

auto/lib/perl/make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
3131

3232
cd $NGX_OBJS/src/http/modules/perl \\
3333
&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
34-
NGX_INCS="\$(CORE_INCS) \$(HTTP_INCS)" \\
34+
NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
3535
NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
3636
$NGX_PERL Makefile.PL \\
3737
LIB=$NGX_PERL_MODULES \\

src/http/modules/perl/Makefile.PL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ WriteMakefile(
2222

2323
depend => {
2424
'nginx.c' => join(" ", map {
25-
"../../../../../$_"
25+
m#^/# ? $_ : "../../../../../$_"
2626
} (split(/\s+/, $ENV{NGX_DEPS}),
2727
"src/http/modules/perl/ngx_http_perl_module.h"))
2828
},

0 commit comments

Comments
 (0)