Merge pull request #3219 from eduar-hte/cpp17

Simplifiy configuration to build using std C++17
owasp-modsecurity · Aug 9, 2024 · 3a83196 · 3a83196
2 parents 6f0e566 + 59254fe
commit 3a83196
Show file tree

Hide file tree

Showing 12 changed files with 1,020 additions and 184 deletions.
diff --git a/build/ax_cxx_compile_stdcxx.m4 b/build/ax_cxx_compile_stdcxx.m4
diff --git a/build/ax_cxx_compile_stdcxx_11.m4 b/build/ax_cxx_compile_stdcxx_11.m4
diff --git a/configure.ac b/configure.ac
@@ -52,8 +52,8 @@ AC_PROG_MAKE_SET
 PKG_PROG_PKG_CONFIG
 
 
-# Check if the compiler is c++17 compatible.
-# AX_CXX_COMPILE_STDCXX_17(,mandatory)
+# Set C++ standard version and check if compiler supports it.
+AX_CXX_COMPILE_STDCXX(17, noext, mandatory)
 
 # Check for libinjection
 if ! test -f "${srcdir}/others/libinjection/src/libinjection_html5.c"; then

diff --git a/examples/reading_logs_via_rule_message/Makefile.am b/examples/reading_logs_via_rule_message/Makefile.am
@@ -32,7 +32,6 @@ simple_request_LDFLAGS = \
 
 simple_request_CPPFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	-std=c++17 \
 	-I$(top_builddir)/headers \
 	-I$(top_builddir) \
 	-g \

diff --git a/examples/reading_logs_with_offset/Makefile.am b/examples/reading_logs_with_offset/Makefile.am
@@ -32,7 +32,6 @@ read_LDFLAGS = \
 
 read_CPPFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	-std=c++17 \
 	-I$(top_builddir)/headers \
 	-I$(top_builddir) \
 	-g \

diff --git a/examples/using_bodies_in_chunks/Makefile.am b/examples/using_bodies_in_chunks/Makefile.am
@@ -33,7 +33,6 @@ simple_request_LDFLAGS = \
 
 simple_request_CPPFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	-std=c++17 \
 	-I$(top_builddir)/headers \
 	-I$(top_builddir) \
 	-g \

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -311,7 +311,6 @@ libmodsecurity_la_CFLAGS =
 
 
 libmodsecurity_la_CPPFLAGS = \
-	-std=c++17 \
 	-I.. \
 	-g \
 	-I../others \

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
@@ -11,7 +11,6 @@ libmodsec_parser_la_SOURCES = \
 	test.cc
 
 libmodsec_parser_la_CPPFLAGS = \
-	-std=c++17 \
 	-I../.. \
 	-I../../headers \
 	-I../../others \

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -70,7 +70,6 @@ unit_tests_LDFLAGS = \
 
 
 unit_tests_CPPFLAGS = \
-	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-g \
@@ -126,7 +125,6 @@ regression_tests_LDFLAGS = \
 
 
 regression_tests_CPPFLAGS = \
-	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-g \
@@ -179,7 +177,6 @@ rules_optimization_LDFLAGS = \
 	$(YAJL_LDFLAGS)
 
 rules_optimization_CPPFLAGS = \
-	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-g \

diff --git a/test/benchmark/Makefile.am b/test/benchmark/Makefile.am
@@ -32,7 +32,6 @@ benchmark_LDFLAGS = \
 	$(LUA_LDFLAGS)
 
 benchmark_CPPFLAGS = \
-	-std=c++17 \
 	-I$(top_builddir)/headers \
 	$(GLOBAL_CPPFLAGS) \
 	$(PCRE_CFLAGS) \

diff --git a/test/fuzzer/Makefile.am b/test/fuzzer/Makefile.am
@@ -30,7 +30,6 @@ afl_fuzzer_LDADD = \
 
 
 afl_fuzzer_CPPFLAGS = \
-	-std=c++17 \
 	-Icommon \
 	-I../ \
 	-I../../ \

diff --git a/tools/rules-check/Makefile.am b/tools/rules-check/Makefile.am
@@ -28,7 +28,6 @@ modsec_rules_check_LDFLAGS = \
 	$(YAJL_LDFLAGS)
 
 modsec_rules_check_CPPFLAGS = \
-	-std=c++17 \
 	-I$(top_builddir)/headers \
 	$(GLOBAL_CPPFLAGS) \
 	$(PCRE_CFLAGS) \
-Original file line number
+Diff line change
@@ Expand Up / @@ -311,7 +311,6 @@ libmodsecurity_la_CFLAGS = @@
     libmodsecurity_la_CPPFLAGS = \
-    	-std=c++17 \
     	-I.. \
     	-g \
     	-I../others \
@@ Expand Down @@