diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-11-21 16:49:19 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-11-21 16:49:19 +0300 |
| commit | 4c6e31a8577087561cefbed86cf9771604794b8c (patch) | |
| tree | a6887add547a9283c079f2d2f44fb499809b6326 /auto/modules | |
| parent | a91f2b03829b62be84547c38231b477114c8bc9e (diff) | |
| download | nginx-4c6e31a8577087561cefbed86cf9771604794b8c.tar.gz nginx-4c6e31a8577087561cefbed86cf9771604794b8c.tar.bz2 | |
Configure: honor dependencies of dynamic modules.
Dependencies of dynamic modules are added to NGX_ADDON_DEPS (and
it is now used for dynamic modules) to be in line with what happens
in case of static compilation.
To avoid duplication, MAIL_DEPS and STREAM_DEPS are no longer passed
to auto/module when these modules are compiled as dynamic ones. Mail
and stream dependencies are handled explicitly via corresponding
variables.
Diffstat (limited to 'auto/modules')
| -rw-r--r-- | auto/modules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auto/modules b/auto/modules index 89377bf0d..c664fe3cb 100644 --- a/auto/modules +++ b/auto/modules @@ -1252,7 +1252,7 @@ if [ $MAIL != NO ]; then elif [ $MAIL = DYNAMIC ]; then ngx_module_name=$MAIL_MODULES ngx_module_incs= - ngx_module_deps=$MAIL_DEPS + ngx_module_deps= ngx_module_srcs=$MAIL_SRCS ngx_module_libs= ngx_module_link=DYNAMIC @@ -1272,7 +1272,7 @@ if [ $STREAM != NO ]; then elif [ $STREAM = DYNAMIC ]; then ngx_module_name=$STREAM_MODULES ngx_module_incs= - ngx_module_deps=$STREAM_DEPS + ngx_module_deps= ngx_module_srcs=$STREAM_SRCS ngx_module_libs= ngx_module_link=DYNAMIC |