github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-13 06:57:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add searching for lua in /usr/lib{64|32}.

Browse Source 
Do not default to using -Werror (warnings are errors).
This commit is contained in:
brectanus
2008-02-27 23:18:03 +00:00
parent 59a7f65285
commit 1e991d6fcd
5 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apache2/build/find_lua.m4
View File

@@ -66,6 +66,14 @@ if test "${lua_path}" != "no"; then
with_lua_lib="${x}/lib"
lua_lib_name="lua5.1"
break
elif test -e "${x}/lib64/liblua5.1.a"; then
with_lua_lib="${x}/lib64"
lua_lib_name="lua5.1"
break
elif test -e "${x}/lib32/liblua5.1.a"; then
with_lua_lib="${x}/lib32"
lua_lib_name="lua5.1"
break
elif test -e "${x}/liblua.a"; then
with_lua_lib="${x}"
lua_lib_name="lua"
@@ -74,6 +82,14 @@ if test "${lua_path}" != "no"; then
with_lua_lib="${x}/lib"
lua_lib_name="lua"
break
elif test -e "${x}/lib64/liblua.a"; then
with_lua_lib="${x}/lib64"
lua_lib_name="lua"
break
elif test -e "${x}/lib32/liblua.a"; then
with_lua_lib="${x}/lib32"
lua_lib_name="lua"
break
else
with_lua_lib=""
lua_lib_name=""

17
apache2/configure.in
View File

@@ -126,6 +126,21 @@ sinclude(build/find_curl.m4)
### Configure Options
# Strict Compile
AC_ARG_ENABLE(strict-compile,
AS_HELP_STRING([--enable-strict-compile],
[Enable strict compilation (warnings are errors).]),
[
if test "$enableval" != "no"; then
strict_compile="-Werror"
else
strict_compile=
fi
],
[
strict_compile=
])
# DEBUG_CONF
AC_ARG_ENABLE(debug-conf,
AS_HELP_STRING([--enable-debug-conf],
@@ -203,7 +218,7 @@ AC_ARG_ENABLE(modsec-api,
### Build *EXTRA_CFLAGS vars
EXTRA_CFLAGS="-O2 -g -Wall -Werror"
EXTRA_CFLAGS="-O2 -g -Wall $strict_compile"
MODSEC_EXTRA_CFLAGS="$debug_conf $debug_cache $debug_acmp $perf_meas $modsec_api"
APXS_WRAPPER=build/apxs-wrapper

4
apache2/modsecurity.h
View File

@@ -63,8 +63,8 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[];
#define MODSEC_VERSION_MAJOR "2"
#define MODSEC_VERSION_MINOR "5"
#define MODSEC_VERSION_MAINT "0"
#define MODSEC_VERSION_TYPE ""
#define MODSEC_VERSION_RELEASE ""
#define MODSEC_VERSION_TYPE "rc"
#define MODSEC_VERSION_RELEASE "1"
#define MODULE_NAME "ModSecurity for Apache"
#define MODULE_RELEASE \