]> git.kaiwu.me - nginx.git/commitdiff
Fixed build with embedded perl and --with-openssl.
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 13 Feb 2012 15:38:48 +0000 (15:38 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 13 Feb 2012 15:38:48 +0000 (15:38 +0000)
auto/lib/perl/make
src/http/modules/perl/Makefile.PL

index f5d9ab50189cba3d96f2e8a50a86e7f2c5b49269..b4df01dd90ca647773a3bea6ecb131f9692d67fe 100644 (file)
@@ -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
index 6575f284cbed128fe264ee75d278b724a8350f84..cfb38c190df60f08da7814e3cec81920bbb0542b 100644 (file)
@@ -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'     =>