]> git.kaiwu.me - nginx.git/commitdiff
Configure: fixed build with --with-stream.
authorRuslan Ermilov <ru@nginx.com>
Thu, 16 Mar 2017 17:38:26 +0000 (20:38 +0300)
committerRuslan Ermilov <ru@nginx.com>
Thu, 16 Mar 2017 17:38:26 +0000 (20:38 +0300)
Some combinations of options might cause the builds with the
--with-stream option to break due to invalid value of the
STREAM_INCS make variable, e.g.

auto/configure \
    --with-stream \
    --with-http_perl_module=dynamic \
    --without-http_memcached_module \
    --without-http_empty_gif_module \
    --without-http_browser_module \
    --without-http_upstream_hash_module \
    --without-http_upstream_ip_hash_module \
    --without-http_upstream_least_conn_module \
    --without-http_upstream_keepalive_module \
    --without-http_upstream_zone_module \

Explicit initialization of ngx_module_libs and ngx_module_link
matches what we already do when processing mail modules, and
is also required after the next change.

auto/modules

index c664fe3cbf07c7e21dde9a87bbcc949c177a45f7..b72a8595f98157d4516d779cddcbef97d217f728 100644 (file)
@@ -966,6 +966,8 @@ if [ $STREAM != NO ]; then
     STREAM_INCS=
 
     ngx_module_type=STREAM
+    ngx_module_libs=
+    ngx_module_link=YES
 
     ngx_module_order=