From 8cb7134f49bcdded469b3e72415b96794190257e Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 13 Feb 2012 15:38:48 +0000 Subject: [PATCH] Fixed build with embedded perl and --with-openssl. --- auto/lib/perl/make | 1 + src/http/modules/perl/Makefile.PL | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/auto/lib/perl/make b/auto/lib/perl/make index f5d9ab501..b4df01dd9 100644 --- a/auto/lib/perl/make +++ b/auto/lib/perl/make @@ -28,6 +28,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \ && NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \ NGX_PCRE=$PCRE \ NGX_OBJS=$NGX_OBJS \ + NGX_OPENSSL=$OPENSSL \ $NGX_PERL Makefile.PL \ LIB=$NGX_PERL_MODULES \ INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN diff --git a/src/http/modules/perl/Makefile.PL b/src/http/modules/perl/Makefile.PL index 6575f284c..cfb38c190 100644 --- a/src/http/modules/perl/Makefile.PL +++ b/src/http/modules/perl/Makefile.PL @@ -25,7 +25,11 @@ WriteMakefile( "-I ../../../../../$ENV{NGX_OBJS} " . ($ENV{NGX_PCRE} =~ /^(YES|NO)/ ? "" : ($ENV{NGX_PCRE} =~ m#^/# ? "-I $ENV{NGX_PCRE} " : - "-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 ")), depend => { 'nginx.c' =>