[njs] Fixed nginx modules building introduced in 9b37882ad552.

Igor Sysoev igor at sysoev.ru
Wed Nov 30 11:15:18 UTC 2016


details:   http://hg.nginx.org/njs/rev/adfb758ad872
branches:  
changeset: 267:adfb758ad872
user:      Igor Sysoev <igor at sysoev.ru>
date:      Wed Nov 30 14:10:49 2016 +0300
description:
Fixed nginx modules building introduced in 9b37882ad552.
Removed old third party module addition method.

diffstat:

 nginx/config |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r fd2a05f9eacf -r adfb758ad872 nginx/config
--- a/nginx/config	Tue Nov 22 00:06:46 2016 +0300
+++ b/nginx/config	Wed Nov 30 14:10:49 2016 +0300
@@ -4,6 +4,7 @@ if [ $HTTP != NO ]; then
     ngx_module_type=HTTP
     ngx_module_name=ngx_http_js_module
     ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs"
+    ngx_module_deps="$ngx_addon_dir/../build/libnjs.a"
     ngx_module_srcs="$ngx_addon_dir/ngx_http_js_module.c"
     ngx_module_libs="PCRE $ngx_addon_dir/../build/libnjs.a -lm"
 
@@ -14,10 +15,9 @@ if [ $STREAM != NO ]; then
     ngx_module_type=STREAM
     ngx_module_name=ngx_stream_js_module
     ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs"
+    ngx_module_deps="$ngx_addon_dir/../build/libnjs.a"
     ngx_module_srcs="$ngx_addon_dir/ngx_stream_js_module.c"
     ngx_module_libs="PCRE $ngx_addon_dir/../build/libnjs.a -lm"
 
     . auto/module
 fi
-
-LINK_DEPS="$LINK_DEPS $ngx_addon_dir/../build/libnjs.a"



More information about the nginx-devel mailing list