-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 to configure script. This commit deletes this config file and adds a meta-config which is populated by configure whenever the standalone-module is enabled.
- Loading branch information
Felipe Zimmerle
committed
Dec 12, 2013
1 parent
da16d9e
commit 351b9cc
Showing
3 changed files
with
45 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
#!/bin/sh | ||
|
||
CFLAGS="$CFLAGS \ | ||
@APR_CFLAGS@ \ | ||
@APU_CFLAGS@ \ | ||
@APXS_CFLAGS@ \ | ||
@LIBXML2_CFLAGS@ \ | ||
@LUA_CFLAGS@ \ | ||
@MODSEC_EXTRA_CFLAGS@ \ | ||
@PCRE_CFLAGS@" | ||
|
||
|
||
CORE_LIBS="$CORE_LIBS \ | ||
@APR_LINKLD@ \ | ||
@APU_LINKLD@ \ | ||
@APXS_CFLAGS@ \ | ||
@CURL_LDADD@ \ | ||
@LIBXML2_LDADD@ \ | ||
@LUA_LDADD@ \ | ||
@PCRE_LDADD@ \ | ||
@APXS_LIBS@" | ||
|
||
ngx_addon_name=ngx_http_modsecurity | ||
|
||
CORE_MODULES="$CORE_MODULES ngx_pool_context_module" | ||
|
||
HTTP_AUX_FILTER_MODULES="ngx_http_modsecurity $HTTP_AUX_FILTER_MODULES" | ||
|
||
NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ | ||
$ngx_addon_dir/ngx_http_modsecurity.c \ | ||
$ngx_addon_dir/apr_bucket_nginx.c \ | ||
$ngx_addon_dir/ngx_pool_context.c" | ||
|
||
NGX_ADDON_DEPS="$NGX_ADDON_DEPS \ | ||
$ngx_addon_dir/apr_bucket_nginx.h \ | ||
$ngx_addon_dir/ngx_pool_context.h" | ||
|
||
CORE_LIBS="$ngx_addon_dir/../../standalone/.libs/standalone.a $CORE_LIBS" | ||
|
||
CORE_INCS="$CORE_INCS \ | ||
$ngx_addon_dir \ | ||
$ngx_addon_dir/../../standalone \ | ||
$ngx_addon_dir/../../apache2" | ||
|