Skip to content

Simplifiy configuration to build using std C++17 #3219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Simplifiy configuration to build using std C++17 #3219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,018 changes: 1,018 additions & 0 deletions build/ax_cxx_compile_stdcxx.m4
View file
Open in desktop

Large diffs are not rendered by default.

171 changes: 0 additions & 171 deletions build/ax_cxx_compile_stdcxx_11.m4
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion examples/reading_logs_via_rule_message/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ simple_request_LDFLAGS = \

simple_request_CPPFLAGS = \
$(GLOBAL_CFLAGS) \
-std=c++17 \
-I$(top_builddir)/headers \
-I$(top_builddir) \
-g \
Expand Down
1 change: 0 additions & 1 deletion examples/reading_logs_with_offset/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ read_LDFLAGS = \

read_CPPFLAGS = \
$(GLOBAL_CFLAGS) \
-std=c++17 \
-I$(top_builddir)/headers \
-I$(top_builddir) \
-g \
Expand Down
1 change: 0 additions & 1 deletion examples/using_bodies_in_chunks/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ simple_request_LDFLAGS = \

simple_request_CPPFLAGS = \
$(GLOBAL_CFLAGS) \
-std=c++17 \
-I$(top_builddir)/headers \
-I$(top_builddir) \
-g \
Expand Down
1 change: 0 additions & 1 deletion src/Makefile.am
View file
Open in desktop
Original file line number Diff 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
1 change: 0 additions & 1 deletion src/parser/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ libmodsec_parser_la_SOURCES = \
test.cc

libmodsec_parser_la_CPPFLAGS = \
-std=c++17 \
-I../.. \
-I../../headers \
-I../../others \
Expand Down
3 changes: 0 additions & 3 deletions test/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ unit_tests_LDFLAGS = \


unit_tests_CPPFLAGS = \
-std=c++17 \
-Icommon \
-I../ \
-g \
Expand Down Expand Up @@ -126,7 +125,6 @@ regression_tests_LDFLAGS = \


regression_tests_CPPFLAGS = \
-std=c++17 \
-Icommon \
-I../ \
-g \
Expand Down Expand Up @@ -179,7 +177,6 @@ rules_optimization_LDFLAGS = \
$(YAJL_LDFLAGS)

rules_optimization_CPPFLAGS = \
-std=c++17 \
-Icommon \
-I../ \
-g \
Expand Down
1 change: 0 additions & 1 deletion test/benchmark/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ benchmark_LDFLAGS = \
$(LUA_LDFLAGS)

benchmark_CPPFLAGS = \
-std=c++17 \
-I$(top_builddir)/headers \
$(GLOBAL_CPPFLAGS) \
$(PCRE_CFLAGS) \
Expand Down
1 change: 0 additions & 1 deletion test/fuzzer/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ afl_fuzzer_LDADD = \


afl_fuzzer_CPPFLAGS = \
-std=c++17 \
-Icommon \
-I../ \
-I../../ \
Expand Down
1 change: 0 additions & 1 deletion tools/rules-check/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down