Merge pull request #3390 from arvedarved/buildsystem-fixes

Buildsystem fixes
This commit is contained in:
Ervin Hegedus 2025-06-07 09:06:04 +02:00 committed by GitHub
commit f64ea2a708
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 28 additions and 26 deletions

View File

@ -63,7 +63,7 @@ cppcheck:
--enable=warning,style,performance,portability,unusedFunction,missingInclude \
--inconclusive \
--template="warning: {file},{line},{severity},{id},{message}" \
-I headers -I . -I others -I src -I others/mbedtls/include \
-I headers -I . -I $(top_srcdir)/others -I $(top_srcdir)/src -I $(top_srcdir)/others/mbedtls/include \
--error-exitcode=1 \
-i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \
-i others \

View File

@ -42,7 +42,7 @@ AC_PREFIX_DEFAULT([/usr/local/modsecurity])
# General automake options.
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
# Check for dependencies (C++, AR, Lex, Yacc and Make)

View File

@ -28,6 +28,6 @@ libmbedtls_la_SOURCES = \
mbedtls/library/sha1.c \
mbedtls/library/platform_util.c
libmbedtls_la_CFLAGS = -DMBEDTLS_CONFIG_FILE=\"mbedtls/mbedtls_config.h\" -Imbedtls/include
libmbedtls_la_CFLAGS = -DMBEDTLS_CONFIG_FILE=\"mbedtls/mbedtls_config.h\" -I$(top_srcdir)/others/mbedtls/include
libmbedtls_la_CPPFLAGS =
libmbedtls_la_LIBADD =

View File

@ -68,21 +68,21 @@ libmodsecurity_includesub_actions_HEADERS = \
noinst_HEADERS = \
actions/*.h \
actions/ctl/*.h \
actions/data/*.h \
actions/disruptive/*.h \
actions/transformations/*.h \
debug_log/*.h \
audit_log/writer/*.h \
collection/backend/*.h \
operators/*.h \
parser/*.h \
request_body_processor/*.h \
utils/*.h \
variables/*.h \
engine/*.h \
*.h
$(wildcard actions/*.h) \
$(wildcard actions/ctl/*.h) \
$(wildcard actions/data/*.h) \
$(wildcard actions/disruptive/*.h) \
$(wildcard actions/transformations/*.h) \
$(wildcard debug_log/*.h) \
$(wildcard audit_log/writer/*.h) \
$(wildcard collection/backend/*.h) \
$(wildcard operators/*.h) \
$(wildcard parser/*.h) \
$(wildcard request_body_processor/*.h) \
$(wildcard utils/*.h) \
$(wildcard variables/*.h) \
$(wildcard engine/*.h) \
$(wildcard *.h)
ENGINES = \
@ -308,13 +308,14 @@ libmodsecurity_la_CFLAGS =
libmodsecurity_la_CPPFLAGS = \
-I.. \
-I$(top_srcdir) \
-I$(top_builddir) \
-g \
-I../others \
-I../others/mbedtls/include \
-I$(top_srcdir)/others \
-I$(top_srcdir)/others/mbedtls/include \
-fPIC \
-O3 \
-I../headers \
-I$(top_srcdir)/headers \
$(CURL_CFLAGS) \
$(GEOIP_CFLAGS) \
$(GLOBAL_CPPFLAGS) \

View File

@ -72,7 +72,7 @@ unit_tests_LDFLAGS = \
unit_tests_CPPFLAGS = \
-Icommon \
-I../ \
-I$(top_srcdir)/ \
-g \
-I$(top_builddir)/headers \
$(CURL_CFLAGS) \
@ -127,7 +127,7 @@ regression_tests_LDFLAGS = \
regression_tests_CPPFLAGS = \
-Icommon \
-I../ \
-I$(top_srcdir) \
-g \
-I$(top_builddir)/headers \
$(CURL_CFLAGS) \
@ -179,7 +179,7 @@ rules_optimization_LDFLAGS = \
rules_optimization_CPPFLAGS = \
-Icommon \
-I../ \
-I$(top_srcdir)/ \
-g \
-I$(top_builddir)/headers \
$(CURL_CFLAGS) \

View File

@ -26,7 +26,8 @@ modsec_rules_check_LDFLAGS = \
$(LMDB_LDFLAGS) \
$(LUA_LDFLAGS) \
$(SSDEEP_LDFLAGS) \
$(YAJL_LDFLAGS)
$(YAJL_LDFLAGS) \
$(LIBXML2_LDFLAGS)
modsec_rules_check_CPPFLAGS = \
-I$(top_builddir)/headers \