From: Ruslan Ermilov <ru@nginx.com>
Date: Thu, 15 Sep 2016 07:52:01 +0000 (+0300)
Subject: Style: express requirement to use PCRE via $ngx_module_libs.
X-Git-Tag: 0.1.3~18
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=86d6f92df76c785c61392e37a2f968ec3bbdfd27;p=njs.git

Style: express requirement to use PCRE via $ngx_module_libs.
---

diff --git a/nginx/config b/nginx/config
index 3ea9e99b..62638218 100644
--- a/nginx/config
+++ b/nginx/config
@@ -1,13 +1,11 @@
 ngx_addon_name="ngx_js_module"
 
-USE_PCRE=YES
-
 if test -n "$ngx_module_link"; 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_srcs="$ngx_addon_dir/ngx_http_js_module.c"
-    ngx_module_libs="$ngx_addon_dir/../build/libnjs.a -lm"
+    ngx_module_libs="PCRE $ngx_addon_dir/../build/libnjs.a -lm"
 
     . auto/module
 
@@ -15,10 +13,12 @@ if test -n "$ngx_module_link"; then
     ngx_module_name=ngx_stream_js_module
     ngx_module_incs="$ngx_addon_dir/../nxt $ngx_addon_dir/../njs"
     ngx_module_srcs="$ngx_addon_dir/ngx_stream_js_module.c"
-    ngx_module_libs="$ngx_addon_dir/../build/libnjs.a -lm"
+    ngx_module_libs="PCRE $ngx_addon_dir/../build/libnjs.a -lm"
 
     . auto/module
 else
+    USE_PCRE=YES
+
     HTTP_MODULES="$HTTP_MODULES ngx_http_js_module"
     STREAM_MODULES="$STREAM_MODULES ngx_stream_js_module"
     CORE_INCS="$CORE_INCS $ngx_addon_dir/../nxt $ngx_addon_dir/../njs"