File tree Expand file tree Collapse file tree 1 file changed +11
-5
lines changed Expand file tree Collapse file tree 1 file changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -32,12 +32,18 @@ if [ -n "$MODSECURITY_INC" -o -n "$MODSECURITY_LIB" ]; then
3232 ngx_modsecurity_opt_I=" -I$MODSECURITY_INC "
3333 ngx_modsecurity_opt_L=" -L$MODSECURITY_LIB $YAJL_EXTRA "
3434
35- if [ $NGX_RPATH = YES ]; then
36- ngx_feature_libs=" -R$MODSECURITY_LIB -L$MODSECURITY_LIB -lmodsecurity $YAJL_EXTRA "
37- elif [ " $NGX_IGNORE_RPATH " != " YES" -a $NGX_SYSTEM = " Linux" ]; then
38- ngx_feature_libs=" -Wl,-rpath,$MODSECURITY_LIB -L$MODSECURITY_LIB -lmodsecurity $YAJL_EXTRA "
35+ if [ " $NGX_CC_NAME " != msvc ]; then
36+ if [ $NGX_RPATH = YES ]; then
37+ ngx_feature_libs=" -R$MODSECURITY_LIB -L$MODSECURITY_LIB -lmodsecurity $YAJL_EXTRA "
38+ elif [ " $NGX_IGNORE_RPATH " != " YES" -a $NGX_SYSTEM = " Linux" ]; then
39+ ngx_feature_libs=" -Wl,-rpath,$MODSECURITY_LIB -L$MODSECURITY_LIB -lmodsecurity $YAJL_EXTRA "
40+ else
41+ ngx_feature_libs=" -L$MODSECURITY_LIB -lmodsecurity $YAJL_EXTRA "
42+ fi
3943 else
40- ngx_feature_libs=" -L$MODSECURITY_LIB -lmodsecurity $YAJL_EXTRA "
44+ # Adjust link library arguments to work with MSVC C++ compiler and
45+ # output of the Windows port of libModSecurity v3
46+ ngx_feature_libs=" $MODSECURITY_LIB /libModSecurity.lib $YAJL_EXTRA "
4147 fi
4248
4349 . auto/feature
You can’t perform that action at this time.
0 commit comments