Merge pull request #3079 from MirkoDziadzka/mirko-bump-c++-version

No other remark was added, merging. Thanks @MirkoDziadzka.
This commit is contained in:
Ervin Hegedus 2024-02-27 19:34:48 +01:00 committed by GitHub
commit f474cc59b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 14 additions and 15 deletions

View File

@ -76,7 +76,7 @@ Windows build is not ready yet.
## Dependencies ## Dependencies
This library is written in C++ using the C++11 standards. It also uses Flex This library is written in C++ using the C++17 standards. It also uses Flex
and Yacc to produce the “Sec Rules Language” parser. Other, mandatory dependencies include YAJL, as ModSecurity uses JSON for producing logs and its testing framework, libpcre (not yet mandatory) for processing regular expressions in SecRules, and libXML2 (not yet mandatory) which is used for parsing XML requests. and Yacc to produce the “Sec Rules Language” parser. Other, mandatory dependencies include YAJL, as ModSecurity uses JSON for producing logs and its testing framework, libpcre (not yet mandatory) for processing regular expressions in SecRules, and libXML2 (not yet mandatory) which is used for parsing XML requests.
All others dependencies are related to operators specified within SecRules or configuration directives and may not be required for compilation. A short list of such dependencies is as follows: All others dependencies are related to operators specified within SecRules or configuration directives and may not be required for compilation. A short list of such dependencies is as follows:

View File

@ -52,8 +52,8 @@ AC_PROG_MAKE_SET
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
# Check if the compiler is c++11 compatible. # Check if the compiler is c++17 compatible.
# AX_CXX_COMPILE_STDCXX_11(,mandatory) # AX_CXX_COMPILE_STDCXX_17(,mandatory)
# Check for libinjection # Check for libinjection
if ! test -f "${srcdir}/others/libinjection/src/libinjection_html5.c"; then if ! test -f "${srcdir}/others/libinjection/src/libinjection_html5.c"; then

View File

@ -32,7 +32,7 @@ simple_request_LDFLAGS = \
simple_request_CPPFLAGS = \ simple_request_CPPFLAGS = \
$(GLOBAL_CFLAGS) \ $(GLOBAL_CFLAGS) \
-std=c++11 \ -std=c++17 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
-I$(top_builddir) \ -I$(top_builddir) \
-g \ -g \

View File

@ -32,7 +32,7 @@ read_LDFLAGS = \
read_CPPFLAGS = \ read_CPPFLAGS = \
$(GLOBAL_CFLAGS) \ $(GLOBAL_CFLAGS) \
-std=c++11 \ -std=c++17 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
-I$(top_builddir) \ -I$(top_builddir) \
-g \ -g \

View File

@ -33,7 +33,7 @@ simple_request_LDFLAGS = \
simple_request_CPPFLAGS = \ simple_request_CPPFLAGS = \
$(GLOBAL_CFLAGS) \ $(GLOBAL_CFLAGS) \
-std=c++11 \ -std=c++17 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
-I$(top_builddir) \ -I$(top_builddir) \
-g \ -g \

View File

@ -311,7 +311,7 @@ libmodsecurity_la_CFLAGS =
libmodsecurity_la_CPPFLAGS = \ libmodsecurity_la_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-I.. \ -I.. \
-g \ -g \
-I../others \ -I../others \

View File

@ -11,11 +11,10 @@ libmodsec_parser_la_SOURCES = \
test.cc test.cc
libmodsec_parser_la_CPPFLAGS = \ libmodsec_parser_la_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-I../.. \ -I../.. \
-I../../headers \ -I../../headers \
-I../../others \ -I../../others \
-std=c++11 \
-I.. \ -I.. \
-g \ -g \
-fPIC \ -fPIC \

View File

@ -70,7 +70,7 @@ unit_tests_LDFLAGS = \
unit_tests_CPPFLAGS = \ unit_tests_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-Icommon \ -Icommon \
-I../ \ -I../ \
-g \ -g \
@ -126,7 +126,7 @@ regression_tests_LDFLAGS = \
regression_tests_CPPFLAGS = \ regression_tests_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-Icommon \ -Icommon \
-I../ \ -I../ \
-g \ -g \
@ -179,7 +179,7 @@ rules_optimization_LDFLAGS = \
$(YAJL_LDFLAGS) $(YAJL_LDFLAGS)
rules_optimization_CPPFLAGS = \ rules_optimization_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-Icommon \ -Icommon \
-I../ \ -I../ \
-g \ -g \

View File

@ -32,7 +32,7 @@ benchmark_LDFLAGS = \
$(LUA_LDFLAGS) $(LUA_LDFLAGS)
benchmark_CPPFLAGS = \ benchmark_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
$(GLOBAL_CPPFLAGS) \ $(GLOBAL_CPPFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \

View File

@ -30,7 +30,7 @@ afl_fuzzer_LDADD = \
afl_fuzzer_CPPFLAGS = \ afl_fuzzer_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-Icommon \ -Icommon \
-I../ \ -I../ \
-I../../ \ -I../../ \

View File

@ -28,7 +28,7 @@ modsec_rules_check_LDFLAGS = \
$(YAJL_LDFLAGS) $(YAJL_LDFLAGS)
modsec_rules_check_CPPFLAGS = \ modsec_rules_check_CPPFLAGS = \
-std=c++11 \ -std=c++17 \
-I$(top_builddir)/headers \ -I$(top_builddir)/headers \
$(GLOBAL_CPPFLAGS) \ $(GLOBAL_CPPFLAGS) \
$(PCRE_CFLAGS) \ $(PCRE_CFLAGS) \