Mercurial > hg > nginx

diff auto/lib/perl/make @ 5180:2db6bdcaedc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 19 Apr 2013 12:19:57 +0000
parents 482fda984556
children 9f17e765a21e
line wrap: on
line diff
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -31,7 +31,7 @@ cat << END                              
 
 	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 \\