github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-15 17:12:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makes re2 detectable by the build scripts

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-01-18 18:59:04 -03:00
parent a5ee59f5d0
commit 22136788c8
13 changed files with 310 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/Makefile.am
View File

@@ -52,7 +52,8 @@ unit_tests_LDADD = \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(YAJL_LDADD)
$(YAJL_LDADD) \
$(RE2_LDADD)
unit_tests_LDFLAGS = \
@@ -61,7 +62,8 @@ unit_tests_LDFLAGS = \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
$(YAJL_LDFLAGS) \
$(RE2_LDFLAGS)
unit_tests_CPPFLAGS = \
@@ -80,7 +82,8 @@ unit_tests_CPPFLAGS = \
$(YAJL_CFLAGS) \
$(LUA_CFLAGS) \
$(SSDEEP_CFLAGS) \
$(LIBXML2_CFLAGS)
$(LIBXML2_CFLAGS) \
$(RE2_CFLAGS)
# regression
@@ -102,7 +105,8 @@ regression_tests_LDADD = \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(YAJL_LDADD)
$(YAJL_LDADD) \
$(RE2_LDADD)
regression_tests_LDFLAGS = \
@@ -111,7 +115,8 @@ regression_tests_LDFLAGS = \
$(YAJL_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(LUA_LDFLAGS)
$(LUA_LDFLAGS) \
$(RE2_LDFLAGS)
regression_tests_CPPFLAGS = \
@@ -130,7 +135,8 @@ regression_tests_CPPFLAGS = \
$(SSDEEP_CFLAGS) \
$(PCRE_CFLAGS) \
$(YAJL_CFLAGS) \
$(LIBXML2_CFLAGS)
$(LIBXML2_CFLAGS) \
$(RE2_CFLAGS)
# optimization
@@ -151,7 +157,8 @@ rules_optimization_LDADD = \
$(LUA_LDADD) \
$(PCRE_LDADD) \
$(SSDEEP_LDADD) \
$(YAJL_LDADD)
$(YAJL_LDADD) \
$(RE2_LDADD)
rules_optimization_LDFLAGS = \
$(GEOIP_LDFLAGS) \
@@ -159,7 +166,8 @@ rules_optimization_LDFLAGS = \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
$(YAJL_LDFLAGS) \
$(RE2_LDFLAGS)
rules_optimization_CPPFLAGS = \
-std=c++11 \
@@ -177,5 +185,6 @@ rules_optimization_CPPFLAGS = \
$(SSDEEP_CFLAGS) \
$(PCRE_CFLAGS) \
$(YAJL_CFLAGS) \
$(LIBXML2_CFLAGS)
$(LIBXML2_CFLAGS) \
$(RE2_CFLAGS)

9
test/benchmark/Makefile.am
View File

@@ -16,7 +16,8 @@ benchmark_LDADD = \
$(SSDEEP_LDADD) \
$(LUA_LDADD) \
$(LIBXML2_LDADD) \
$(GLOBAL_LDADD)
$(GLOBAL_LDADD) \
$(RE2_LDADD)
benchmark_LDFLAGS = \
$(top_builddir)/src/.libs/libmodsecurity.a \
@@ -25,7 +26,8 @@ benchmark_LDFLAGS = \
$(YAJL_LDFLAGS) \
$(LMDB_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(LUA_LDFLAGS)
$(LUA_LDFLAGS) \
$(RE2_LDFLAGS)
benchmark_CPPFLAGS = \
-std=c++11 \
@@ -33,7 +35,8 @@ benchmark_CPPFLAGS = \
$(GLOBAL_CPPFLAGS) \
$(PCRE_CFLAGS) \
$(LMDB_CFLAGS) \
$(LIBXML2_CFLAGS)
$(LIBXML2_CFLAGS) \
$(RE2_CFLAGS)
MAINTAINERCLEANFILES = \
Makefile.in