Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit351b9cc

Browse files
author
Felipe Zimmerle
committed
nginx: generates config file using configure input.
The nginx config file was looking for depedencies by its own,by doing that it was ignoring the options that were passed toconfigure script. This commit deletes this config file and addsa meta-config which is populated by configure whenever thestandalone-module is enabled.
1 parentda16d9e commit351b9cc

File tree

3 files changed

+45
-87
lines changed

3 files changed

+45
-87
lines changed

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ AC_CONFIG_FILES([apache2/Makefile])
707707
fi
708708
if test "$build_standalone_module" -ne 0; then
709709
AC_CONFIG_FILES([standalone/Makefile])
710+
AC_CONFIG_FILES([nginx/modsecurity/config])
710711
fi
711712
if test "$build_extentions" -ne 0; then
712713
AC_CONFIG_FILES([ext/Makefile])

‎nginx/modsecurity/config‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎nginx/modsecurity/config.in‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/sh
2+
3+
CFLAGS="$CFLAGS\
4+
@APR_CFLAGS@\
5+
@APU_CFLAGS@\
6+
@APXS_CFLAGS@\
7+
@LIBXML2_CFLAGS@\
8+
@LUA_CFLAGS@\
9+
@MODSEC_EXTRA_CFLAGS@\
10+
@PCRE_CFLAGS@"
11+
12+
13+
CORE_LIBS="$CORE_LIBS\
14+
@APR_LINKLD@\
15+
@APU_LINKLD@\
16+
@APXS_CFLAGS@\
17+
@CURL_LDADD@\
18+
@LIBXML2_LDADD@\
19+
@LUA_LDADD@\
20+
@PCRE_LDADD@\
21+
@APXS_LIBS@"
22+
23+
ngx_addon_name=ngx_http_modsecurity
24+
25+
CORE_MODULES="$CORE_MODULES ngx_pool_context_module"
26+
27+
HTTP_AUX_FILTER_MODULES="ngx_http_modsecurity$HTTP_AUX_FILTER_MODULES"
28+
29+
NGX_ADDON_SRCS="$NGX_ADDON_SRCS\
30+
$ngx_addon_dir/ngx_http_modsecurity.c\
31+
$ngx_addon_dir/apr_bucket_nginx.c\
32+
$ngx_addon_dir/ngx_pool_context.c"
33+
34+
NGX_ADDON_DEPS="$NGX_ADDON_DEPS\
35+
$ngx_addon_dir/apr_bucket_nginx.h\
36+
$ngx_addon_dir/ngx_pool_context.h"
37+
38+
CORE_LIBS="$ngx_addon_dir/../../standalone/.libs/standalone.a$CORE_LIBS"
39+
40+
CORE_INCS="$CORE_INCS\
41+
$ngx_addon_dir\
42+
$ngx_addon_dir/../../standalone\
43+
$ngx_addon_dir/../../apache2"
44+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp